mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
Merge remote-tracking branch 'upstream/master' into openelec-3.2
This commit is contained in:
Stefan Saraev
commit
bdcee0635d
@ -28,5 +28,5 @@
|
||||
# stub function
|
||||
wait_for_xorg () {
|
||||
echo 0 > /sys/class/vtconsole/vtcon1/bind
|
||||
# fbset -g 1 1 1 1 32
|
||||
fbset -g 1 1 1 1 32
|
||||
}
|
||||
|
||||
@ -34,7 +34,7 @@ case "$LINUX" in
|
||||
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
;;
|
||||
*)
|
||||
PKG_VERSION="3.10.5"
|
||||
PKG_VERSION="3.10.7"
|
||||
PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
;;
|
||||
esac
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="service.openelec.settings"
|
||||
PKG_VERSION="0.2.6"
|
||||
PKG_VERSION="0.2.7"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="prop."
|
||||
|
||||
@ -0,0 +1,72 @@
|
||||
From b0f33807f0dadf11d1b007204607d98d9f17d8f7 Mon Sep 17 00:00:00 2001
|
||||
From: lufi <lutz@fiebach.de>
|
||||
Date: Sun, 18 Aug 2013 22:16:45 +0200
|
||||
Subject: [PATCH 1/2] Update defaults.py
|
||||
|
||||
---
|
||||
defaults.py | 16 ++++++++--------
|
||||
1 file changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/defaults.py b/defaults.py
|
||||
index 7a582de..16e78e8 100755
|
||||
--- a/defaults.py
|
||||
+++ b/defaults.py
|
||||
@@ -144,11 +144,11 @@
|
||||
|
||||
_services = \
|
||||
{
|
||||
- "sshd" : ["sshd.service"],
|
||||
- "avahi" : ["avahi-daemon.service"],
|
||||
- "samba" : ["nmbd.service", "smbd.service"],
|
||||
- "bluetooth" : ["bluetooth.service"],
|
||||
- "obexd" : ["obex.service"],
|
||||
- "syslog" : ["syslog.service"],
|
||||
- "cron" : ["cron.service"],
|
||||
- }
|
||||
\ No newline at end of file
|
||||
+ "sshd" : ["sshd.service"],
|
||||
+ "avahi" : ["avahi-daemon.service"],
|
||||
+ "samba" : ["nmbd.service", "smbd.service"],
|
||||
+ "bluez" : ["bluetooth.service"],
|
||||
+ "obexd" : ["obex.service"],
|
||||
+ "syslog" : ["syslog.service"],
|
||||
+ "cron" : ["cron.service"],
|
||||
+ }
|
||||
--
|
||||
1.8.1.6
|
||||
|
||||
|
||||
From 26d02eb4b2ca01e975a4c0b4c8a91a8010147cbf Mon Sep 17 00:00:00 2001
|
||||
From: lufi <lutz@fiebach.de>
|
||||
Date: Sun, 18 Aug 2013 22:21:28 +0200
|
||||
Subject: [PATCH 2/2] change old service config files to .cache/services/ dir
|
||||
|
||||
---
|
||||
oe.py | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/oe.py b/oe.py
|
||||
index 7df2ba2..d3db4b4 100755
|
||||
--- a/oe.py
|
||||
+++ b/oe.py
|
||||
@@ -213,7 +213,7 @@ def set_service_option(service, option, value):
|
||||
lines = []
|
||||
changed = False
|
||||
|
||||
- conf_file_name = '%s/service_%s.conf' % (CONFIG_CACHE, service)
|
||||
+ conf_file_name = '%s/services/%s.conf' % (CONFIG_CACHE, service)
|
||||
|
||||
if os.path.isfile(conf_file_name):
|
||||
with open(conf_file_name, "r") as conf_file:
|
||||
@@ -239,7 +239,7 @@ def get_service_option(service, option, default=None):
|
||||
conf_file_name = ''
|
||||
|
||||
if not SYSTEMD:
|
||||
- conf_file_name = '%s/service_%s.conf' % (CONFIG_CACHE, service)
|
||||
+ conf_file_name = '%s/services/%s.conf' % (CONFIG_CACHE, service)
|
||||
else:
|
||||
if os.path.exists('%s/services/%s.conf' % (CONFIG_CACHE, service)):
|
||||
conf_file_name = '%s/services/%s.conf' % (CONFIG_CACHE, service)
|
||||
--
|
||||
1.8.1.6
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xbmc-theme-Confluence"
|
||||
PKG_VERSION="12.2-41ba7b9"
|
||||
PKG_VERSION="12.2-7da5ea4"
|
||||
if [ "$XBMC" = "master" ]; then
|
||||
PKG_VERSION="13.alpha-df91888"
|
||||
elif [ "$XBMC" = "xbmc-aml" ]; then
|
||||
|
||||
@ -19,5 +19,6 @@
|
||||
</samba>
|
||||
<network>
|
||||
<curlclienttimeout>30</curlclienttimeout>
|
||||
<readBufferFactor>4.0</readBufferFactor>
|
||||
</network>
|
||||
</advancedsettings>
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xbmc"
|
||||
PKG_VERSION="12.2-41ba7b9"
|
||||
PKG_VERSION="12.2-7da5ea4"
|
||||
if [ "$XBMC" = "master" ]; then
|
||||
PKG_VERSION="13.alpha-df91888"
|
||||
elif [ "$XBMC" = "xbmc-aml" ]; then
|
||||
|
||||
@ -35,8 +35,8 @@
|
||||
mkdir -p /var/run/avahi-daemon
|
||||
while true; do
|
||||
AVAHI_ENABLED=true
|
||||
if [ -f $CONFIG_CACHE/service_avahi.conf ]; then
|
||||
. $CONFIG_CACHE/service_avahi.conf
|
||||
if [ -f $CONFIG_CACHE/services/avahi.conf ]; then
|
||||
. $CONFIG_CACHE/services/avahi.conf
|
||||
fi
|
||||
if [ "$AVAHI_ENABLED" == "true" ]; then
|
||||
wait_for_dbus
|
||||
|
||||
@ -56,7 +56,7 @@ PKG_CONFIGURE_OPTS_TARGET="py_cv_mod_gtk_=yes \
|
||||
--enable-python-dbus \
|
||||
--disable-mono \
|
||||
--disable-monodoc \
|
||||
--enable-autoipd \
|
||||
--disable-autoipd \
|
||||
--disable-doxygen-doc \
|
||||
--disable-doxygen-dot \
|
||||
--disable-doxygen-man \
|
||||
@ -71,13 +71,11 @@ PKG_CONFIGURE_OPTS_TARGET="py_cv_mod_gtk_=yes \
|
||||
--disable-manpages \
|
||||
--disable-xmltoman \
|
||||
--disable-tests \
|
||||
--enable-compat-libdns_sd \
|
||||
--disable-compat-libdns_sd \
|
||||
--disable-compat-howl \
|
||||
--with-xml=expat \
|
||||
--with-avahi-user=avahi \
|
||||
--with-avahi-group=avahi \
|
||||
--with-autoipd-user=avahiautoipd \
|
||||
--with-autoipd-group=avahiautoipd \
|
||||
--disable-nls"
|
||||
|
||||
post_makeinstall_target() {
|
||||
@ -92,7 +90,6 @@ post_makeinstall_target() {
|
||||
# browse domains?
|
||||
sed -e "s,^.*browse-domains=.*$,# browse-domains=,g" -i $INSTALL/etc/avahi/avahi-daemon.conf
|
||||
|
||||
rm -rf $INSTALL/etc/avahi/avahi-autoipd.action
|
||||
rm -rf $INSTALL/etc/avahi/avahi-dnsconfd.action
|
||||
rm -rf $INSTALL/etc/avahi/services/ssh.service
|
||||
if [ ! $SFTP_SERVER = "yes" ]; then
|
||||
@ -100,7 +97,6 @@ post_makeinstall_target() {
|
||||
fi
|
||||
rm -rf $INSTALL/lib/systemd
|
||||
rm -f $INSTALL/usr/share/dbus-1/system-services/org.freedesktop.Avahi.service
|
||||
rm -f $INSTALL/usr/sbin/avahi-autoipd
|
||||
rm -f $INSTALL/usr/sbin/avahi-dnsconfd
|
||||
rm -f $INSTALL/usr/bin/avahi-bookmarks
|
||||
rm -f $INSTALL/usr/bin/avahi-publish*
|
||||
@ -110,7 +106,4 @@ post_makeinstall_target() {
|
||||
post_install() {
|
||||
add_user avahi x 495 495 "avahi-daemon" "/var/run/avahi-daemon" "/bin/sh"
|
||||
add_group avahi 495
|
||||
|
||||
add_user avahiautoipd x 496 496 "avahi-autoipd" "/var/lib/avahi-autoipd" "/bin/sh"
|
||||
add_group avahiautoipd 496
|
||||
}
|
||||
|
||||
@ -33,8 +33,8 @@
|
||||
fi
|
||||
|
||||
BLUEZ_ENABLED=true
|
||||
if [ -f $CONFIG_CACHE/service_bluez.conf ]; then
|
||||
. $CONFIG_CACHE/service_bluez.conf
|
||||
if [ -f $CONFIG_CACHE/services/bluez.conf ]; then
|
||||
. $CONFIG_CACHE/services/bluez.conf
|
||||
fi
|
||||
|
||||
if [ "$BLUEZ_ENABLED" == "true" ]; then
|
||||
|
||||
@ -34,14 +34,14 @@
|
||||
|
||||
OBEXD_ENABLED=true
|
||||
OBEXD_ROOT=/storage/downloads
|
||||
if [ -f $CONFIG_CACHE/service_bluez.conf ]; then
|
||||
. $CONFIG_CACHE/service_bluez.conf
|
||||
if [ -f $CONFIG_CACHE/services/bluez.conf ]; then
|
||||
. $CONFIG_CACHE/services/bluez.conf
|
||||
fi
|
||||
|
||||
if [ "$BLUEZ_ENABLED" == "true" -a "$OBEXD_ENABLED" == "true" ]; then
|
||||
progress "Starting obexd"
|
||||
wait_for_dbus
|
||||
mkdir -p "$OBEXD_ROOT"
|
||||
mkdir -p "$OBEXD_ROOT" &>/dev/null
|
||||
/usr/lib/bluetooth/obexd $OBEXD_DEBUG -r "$OBEXD_ROOT" &>/dev/null
|
||||
fi
|
||||
)&
|
||||
|
||||
@ -25,3 +25,5 @@
|
||||
cd $PKG_BUILD
|
||||
|
||||
make
|
||||
|
||||
sed -e 's,^sunrpc,rpcbind,' -i services
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
################################################################################
|
||||
# This file is part of OpenELEC - http://www.openelec.tv
|
||||
# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
|
||||
#
|
||||
# This Program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2, or (at your option)
|
||||
# any later version.
|
||||
#
|
||||
# This Program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with OpenELEC.tv; see the file COPYING. If not, write to
|
||||
# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
|
||||
# http://www.gnu.org/copyleft/gpl.html
|
||||
################################################################################
|
||||
|
||||
. config/options $1
|
||||
|
||||
cd $PKG_BUILD
|
||||
|
||||
./configure --host=$TARGET_NAME \
|
||||
--build=$HOST_NAME \
|
||||
--prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--localstatedir=/var \
|
||||
--disable-static \
|
||||
--enable-shared \
|
||||
--with-kernel="$SYSROOT_PREFIX/usr" \
|
||||
|
||||
make V=1
|
||||
|
||||
$MAKEINSTALL
|
||||
@ -1,45 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
################################################################################
|
||||
# This file is part of OpenELEC - http://www.openelec.tv
|
||||
# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
|
||||
#
|
||||
# This Program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2, or (at your option)
|
||||
# any later version.
|
||||
#
|
||||
# This Program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with OpenELEC.tv; see the file COPYING. If not, write to
|
||||
# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
|
||||
# http://www.gnu.org/copyleft/gpl.html
|
||||
################################################################################
|
||||
|
||||
. config/options $1
|
||||
|
||||
mkdir -p $INSTALL/usr/lib
|
||||
cp -P $PKG_BUILD/libxtables/.libs/libxtables.so* $INSTALL/usr/lib/
|
||||
cp -P $PKG_BUILD/libiptc/.libs/libip4tc.so* $INSTALL/usr/lib/
|
||||
cp -P $PKG_BUILD/libiptc/.libs/libip6tc.so* $INSTALL/usr/lib/
|
||||
cp -P $PKG_BUILD/libiptc/.libs/libiptc.so* $INSTALL/usr/lib/
|
||||
rm -rf $INSTALL/usr/lib/libiptc.so*T
|
||||
|
||||
mkdir -p $INSTALL/usr/lib/xtables
|
||||
cp -P $PKG_BUILD/extensions/*.so* $INSTALL/usr/lib/xtables
|
||||
|
||||
mkdir -p $INSTALL/usr/sbin
|
||||
cp -P $PKG_BUILD/iptables/.libs/xtables-multi $INSTALL/usr/sbin
|
||||
ln -sf /usr/sbin/xtables-multi $INSTALL/usr/sbin/ip6tables
|
||||
ln -sf /usr/sbin/xtables-multi $INSTALL/usr/sbin/ip6tables-restore
|
||||
ln -sf /usr/sbin/xtables-multi $INSTALL/usr/sbin/ip6tables-save
|
||||
ln -sf /usr/sbin/xtables-multi $INSTALL/usr/sbin/iptables
|
||||
ln -sf /usr/sbin/xtables-multi $INSTALL/usr/sbin/iptables-restore
|
||||
ln -sf /usr/sbin/xtables-multi $INSTALL/usr/sbin/iptables-save
|
||||
|
||||
mkdir -p $INSTALL/usr/bin
|
||||
ln -sf /usr/sbin/xtables-multi $INSTALL/usr/bin/iptables-xml
|
||||
@ -26,11 +26,14 @@ PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.netfilter.org/"
|
||||
PKG_URL="http://www.netfilter.org/projects/iptables/files/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_DEPENDS=""
|
||||
PKG_BUILD_DEPENDS="toolchain linux"
|
||||
PKG_BUILD_DEPENDS_TARGET="toolchain linux"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="network"
|
||||
PKG_SHORTDESC="iptables: IP packet filter administration"
|
||||
PKG_LONGDESC="Iptables is used to set up, maintain, and inspect the tables of IP packet filter rules in the Linux kernel. There are several different tables which may be defined, and each table contains a number of built-in chains, and may contain user-defined chains."
|
||||
PKG_IS_ADDON="no"
|
||||
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="yes"
|
||||
|
||||
PKG_CONFIGURE_OPTS_TARGET="--with-kernel=$SYSROOT_PREFIX/usr"
|
||||
|
||||
@ -27,8 +27,8 @@
|
||||
. /etc/profile
|
||||
|
||||
SSHD_START=false
|
||||
if [ -f $CONFIG_CACHE/service_ssh.conf ]; then
|
||||
. $CONFIG_CACHE/service_ssh.conf
|
||||
if [ -f $CONFIG_CACHE/services/ssh.conf ]; then
|
||||
. $CONFIG_CACHE/services/ssh.conf
|
||||
fi
|
||||
|
||||
# Check if password authentication is disabled
|
||||
|
||||
@ -28,8 +28,8 @@
|
||||
. /etc/profile
|
||||
|
||||
SAMBA_ENABLED=true
|
||||
if [ -f $CONFIG_CACHE/service_samba.conf ]; then
|
||||
. $CONFIG_CACHE/service_samba.conf
|
||||
if [ -f $CONFIG_CACHE/services/samba.conf ]; then
|
||||
. $CONFIG_CACHE/services/samba.conf
|
||||
fi
|
||||
|
||||
if [ "$SAMBA_ENABLED" = "true" ]; then
|
||||
|
||||
@ -29,8 +29,8 @@
|
||||
. /etc/profile
|
||||
|
||||
SYSLOG_REMOTE=false
|
||||
if [ -e $CONFIG_CACHE/service_syslog.conf ] ; then
|
||||
. $CONFIG_CACHE/service_syslog.conf
|
||||
if [ -e $CONFIG_CACHE/services/syslog.conf ] ; then
|
||||
. $CONFIG_CACHE/services/syslog.conf
|
||||
fi
|
||||
|
||||
SYSLOGD_OPTIONS="-L"
|
||||
|
||||
@ -29,8 +29,8 @@
|
||||
. /etc/profile
|
||||
|
||||
CRON_ENABLED=true
|
||||
if [ -f $CONFIG_CACHE/service_cron.conf ]; then
|
||||
. $CONFIG_CACHE/service_cron.conf
|
||||
if [ -f $CONFIG_CACHE/services/cron.conf ]; then
|
||||
. $CONFIG_CACHE/services/cron.conf
|
||||
fi
|
||||
|
||||
if [ "$CRON_ENABLED" == "true" ]; then
|
||||
|
||||
@ -3066,7 +3066,7 @@ CONFIG_MMC=m
|
||||
# MMC/SD/SDIO Card Drivers
|
||||
#
|
||||
CONFIG_MMC_BLOCK=m
|
||||
CONFIG_MMC_BLOCK_MINORS=8
|
||||
CONFIG_MMC_BLOCK_MINORS=32
|
||||
CONFIG_MMC_BLOCK_BOUNCE=y
|
||||
# CONFIG_SDIO_UART is not set
|
||||
# CONFIG_MMC_TEST is not set
|
||||
|
||||
@ -19,6 +19,7 @@
|
||||
</samba>
|
||||
<network>
|
||||
<curlclienttimeout>30</curlclienttimeout>
|
||||
<readBufferFactor>4.0</readBufferFactor>
|
||||
</network>
|
||||
<!-- audio workaround for fusion -->
|
||||
<audiooutput>
|
||||
|
||||
@ -21,6 +21,7 @@
|
||||
</samba>
|
||||
<network>
|
||||
<curlclienttimeout>30</curlclienttimeout>
|
||||
<readBufferFactor>4.0</readBufferFactor>
|
||||
</network>
|
||||
<!-- audio workaround for ATV -->
|
||||
<audiooutput>
|
||||
|
||||
@ -19,6 +19,7 @@
|
||||
</samba>
|
||||
<network>
|
||||
<curlclienttimeout>30</curlclienttimeout>
|
||||
<readBufferFactor>4.0</readBufferFactor>
|
||||
</network>
|
||||
<!-- audio workaround for fusion -->
|
||||
<audiooutput>
|
||||
|
||||
@ -3097,7 +3097,7 @@ CONFIG_MMC=m
|
||||
# MMC/SD/SDIO Card Drivers
|
||||
#
|
||||
CONFIG_MMC_BLOCK=m
|
||||
CONFIG_MMC_BLOCK_MINORS=8
|
||||
CONFIG_MMC_BLOCK_MINORS=32
|
||||
CONFIG_MMC_BLOCK_BOUNCE=y
|
||||
# CONFIG_SDIO_UART is not set
|
||||
# CONFIG_MMC_TEST is not set
|
||||
|
||||
@ -3064,7 +3064,7 @@ CONFIG_MMC=m
|
||||
# MMC/SD/SDIO Card Drivers
|
||||
#
|
||||
CONFIG_MMC_BLOCK=m
|
||||
CONFIG_MMC_BLOCK_MINORS=8
|
||||
CONFIG_MMC_BLOCK_MINORS=32
|
||||
CONFIG_MMC_BLOCK_BOUNCE=y
|
||||
# CONFIG_SDIO_UART is not set
|
||||
# CONFIG_MMC_TEST is not set
|
||||
|
||||
@ -3100,7 +3100,7 @@ CONFIG_MMC=m
|
||||
# MMC/SD/SDIO Card Drivers
|
||||
#
|
||||
CONFIG_MMC_BLOCK=m
|
||||
CONFIG_MMC_BLOCK_MINORS=8
|
||||
CONFIG_MMC_BLOCK_MINORS=32
|
||||
CONFIG_MMC_BLOCK_BOUNCE=y
|
||||
# CONFIG_SDIO_UART is not set
|
||||
# CONFIG_MMC_TEST is not set
|
||||
|
||||
@ -2985,7 +2985,7 @@ CONFIG_MMC=m
|
||||
# MMC/SD/SDIO Card Drivers
|
||||
#
|
||||
CONFIG_MMC_BLOCK=m
|
||||
CONFIG_MMC_BLOCK_MINORS=8
|
||||
CONFIG_MMC_BLOCK_MINORS=32
|
||||
CONFIG_MMC_BLOCK_BOUNCE=y
|
||||
# CONFIG_SDIO_UART is not set
|
||||
# CONFIG_MMC_TEST is not set
|
||||
|
||||
@ -2918,7 +2918,7 @@ CONFIG_MMC=m
|
||||
# MMC/SD/SDIO Card Drivers
|
||||
#
|
||||
CONFIG_MMC_BLOCK=m
|
||||
CONFIG_MMC_BLOCK_MINORS=8
|
||||
CONFIG_MMC_BLOCK_MINORS=32
|
||||
CONFIG_MMC_BLOCK_BOUNCE=y
|
||||
# CONFIG_SDIO_UART is not set
|
||||
# CONFIG_MMC_TEST is not set
|
||||
|
||||
@ -3038,7 +3038,7 @@ CONFIG_MMC=m
|
||||
# MMC/SD/SDIO Card Drivers
|
||||
#
|
||||
CONFIG_MMC_BLOCK=m
|
||||
CONFIG_MMC_BLOCK_MINORS=8
|
||||
CONFIG_MMC_BLOCK_MINORS=32
|
||||
CONFIG_MMC_BLOCK_BOUNCE=y
|
||||
# CONFIG_SDIO_UART is not set
|
||||
# CONFIG_MMC_TEST is not set
|
||||
|
||||
@ -2984,7 +2984,7 @@ CONFIG_MMC=m
|
||||
# MMC/SD/SDIO Card Drivers
|
||||
#
|
||||
CONFIG_MMC_BLOCK=m
|
||||
CONFIG_MMC_BLOCK_MINORS=8
|
||||
CONFIG_MMC_BLOCK_MINORS=32
|
||||
CONFIG_MMC_BLOCK_BOUNCE=y
|
||||
# CONFIG_SDIO_UART is not set
|
||||
# CONFIG_MMC_TEST is not set
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm 3.10.2 Kernel Configuration
|
||||
# Linux/arm 3.10.7 Kernel Configuration
|
||||
#
|
||||
CONFIG_ARM=y
|
||||
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
|
||||
@ -146,7 +146,7 @@ CONFIG_SLAB=y
|
||||
# CONFIG_PROFILING is not set
|
||||
CONFIG_HAVE_OPROFILE=y
|
||||
# CONFIG_KPROBES is not set
|
||||
# CONFIG_JUMP_LABEL is not set
|
||||
CONFIG_JUMP_LABEL=y
|
||||
# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
|
||||
CONFIG_HAVE_KPROBES=y
|
||||
CONFIG_HAVE_KRETPROBES=y
|
||||
@ -305,6 +305,7 @@ CONFIG_ARM_THUMB=y
|
||||
# CONFIG_CPU_ICACHE_DISABLE is not set
|
||||
# CONFIG_CPU_DCACHE_DISABLE is not set
|
||||
# CONFIG_CPU_BPREDICT_DISABLE is not set
|
||||
CONFIG_KUSER_HELPERS=y
|
||||
# CONFIG_CACHE_L2X0 is not set
|
||||
CONFIG_ARM_L1_CACHE_SHIFT=5
|
||||
CONFIG_ARM_DMA_MEM_BUFFERABLE=y
|
||||
@ -429,8 +430,7 @@ CONFIG_VFP=y
|
||||
CONFIG_BINFMT_ELF=y
|
||||
CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
|
||||
CONFIG_BINFMT_SCRIPT=y
|
||||
CONFIG_HAVE_AOUT=y
|
||||
# CONFIG_BINFMT_AOUT is not set
|
||||
# CONFIG_HAVE_AOUT is not set
|
||||
# CONFIG_BINFMT_MISC is not set
|
||||
# CONFIG_COREDUMP is not set
|
||||
|
||||
@ -883,7 +883,7 @@ CONFIG_PPPOE=m
|
||||
CONFIG_PPP_ASYNC=m
|
||||
# CONFIG_PPP_SYNC_TTY is not set
|
||||
# CONFIG_SLIP is not set
|
||||
CONFIG_SLHC=m
|
||||
CONFIG_SLHC=y
|
||||
|
||||
#
|
||||
# USB Network Adapters
|
||||
@ -2138,7 +2138,7 @@ CONFIG_MMC=y
|
||||
# MMC/SD/SDIO Card Drivers
|
||||
#
|
||||
CONFIG_MMC_BLOCK=y
|
||||
CONFIG_MMC_BLOCK_MINORS=8
|
||||
CONFIG_MMC_BLOCK_MINORS=32
|
||||
CONFIG_MMC_BLOCK_BOUNCE=y
|
||||
# CONFIG_SDIO_UART is not set
|
||||
# CONFIG_MMC_TEST is not set
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -29,6 +29,7 @@
|
||||
|
||||
<network>
|
||||
<curlclienttimeout>30</curlclienttimeout>
|
||||
<readBufferFactor>4.0</readBufferFactor>
|
||||
</network>
|
||||
|
||||
</advancedsettings>
|
||||
|
||||
@ -3099,7 +3099,7 @@ CONFIG_MMC=m
|
||||
# MMC/SD/SDIO Card Drivers
|
||||
#
|
||||
CONFIG_MMC_BLOCK=m
|
||||
CONFIG_MMC_BLOCK_MINORS=8
|
||||
CONFIG_MMC_BLOCK_MINORS=32
|
||||
CONFIG_MMC_BLOCK_BOUNCE=y
|
||||
# CONFIG_SDIO_UART is not set
|
||||
# CONFIG_MMC_TEST is not set
|
||||
|
||||
@ -3066,7 +3066,7 @@ CONFIG_MMC=m
|
||||
# MMC/SD/SDIO Card Drivers
|
||||
#
|
||||
CONFIG_MMC_BLOCK=m
|
||||
CONFIG_MMC_BLOCK_MINORS=8
|
||||
CONFIG_MMC_BLOCK_MINORS=32
|
||||
CONFIG_MMC_BLOCK_BOUNCE=y
|
||||
# CONFIG_SDIO_UART is not set
|
||||
# CONFIG_MMC_TEST is not set
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user