From 26c98f2b3e37497cfe8b64bf58656308483b64a3 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Tue, 14 Jan 2014 11:54:48 +0200 Subject: [PATCH 1/6] Revert "add 'mceusb' to suspend/resume module unload list" This reverts commit 6502a469623815bc0fc69ecd838bf062bc81562b. ref #2845 --- packages/sysutils/busybox/config/suspend-modules.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sysutils/busybox/config/suspend-modules.conf b/packages/sysutils/busybox/config/suspend-modules.conf index 9037bc87e2..1321ebc407 100644 --- a/packages/sysutils/busybox/config/suspend-modules.conf +++ b/packages/sysutils/busybox/config/suspend-modules.conf @@ -1 +1 @@ -SUSPEND_MODULES="xhci-hcd jme asix anysee rtl8192se imon r8712u cx23885 cdc_acm mceusb" +SUSPEND_MODULES="xhci-hcd jme asix anysee rtl8192se imon r8712u cx23885 cdc_acm" From f646fceed3cb2b8c0631d3cd2a2b02955ab4955c Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Tue, 14 Jan 2014 16:39:38 +0200 Subject: [PATCH 2/6] createlog: dont run nonexistent tools closes #2881 --- packages/sysutils/busybox/scripts/createlog | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/sysutils/busybox/scripts/createlog b/packages/sysutils/busybox/scripts/createlog index 6f5b479877..5a347c895c 100755 --- a/packages/sysutils/busybox/scripts/createlog +++ b/packages/sysutils/busybox/scripts/createlog @@ -27,13 +27,15 @@ RELEASE="`cat /etc/release`" GIT="`cat /etc/issue |grep git`" getlog_cmd() { - echo "################################################################################" >> $BASEDIR/$LOGDIR/$LOGFILE - echo "# ... output of $@" >> $BASEDIR/$LOGDIR/$LOGFILE - echo "# OpenELEC release: $RELEASE" >> $BASEDIR/$LOGDIR/$LOGFILE - echo "# $GIT" >> $BASEDIR/$LOGDIR/$LOGFILE - echo "################################################################################" >> $BASEDIR/$LOGDIR/$LOGFILE - $@ >> $BASEDIR/$LOGDIR/$LOGFILE - echo "" >> $BASEDIR/$LOGDIR/$LOGFILE + if which $1 >/dev/null; then + echo "################################################################################" >> $BASEDIR/$LOGDIR/$LOGFILE + echo "# ... output of $@" >> $BASEDIR/$LOGDIR/$LOGFILE + echo "# OpenELEC release: $RELEASE" >> $BASEDIR/$LOGDIR/$LOGFILE + echo "# $GIT" >> $BASEDIR/$LOGDIR/$LOGFILE + echo "################################################################################" >> $BASEDIR/$LOGDIR/$LOGFILE + $@ >> $BASEDIR/$LOGDIR/$LOGFILE + echo "" >> $BASEDIR/$LOGDIR/$LOGFILE + fi } rm -rf $BASEDIR/$LOGDIR From 3531cbae3e88bce0265fd487b9a54fd69f68c5bb Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Tue, 14 Jan 2014 16:44:54 +0200 Subject: [PATCH 3/6] createlog: make RPi happy --- packages/sysutils/busybox/scripts/createlog | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/sysutils/busybox/scripts/createlog b/packages/sysutils/busybox/scripts/createlog index 5a347c895c..e1ac910a8f 100755 --- a/packages/sysutils/busybox/scripts/createlog +++ b/packages/sysutils/busybox/scripts/createlog @@ -83,7 +83,10 @@ mkdir -p $BASEDIR/$LOGDIR # Input.log LOGFILE="07_input.log" getlog_cmd cat /proc/bus/input/devices - getlog_cmd cat /proc/acpi/wakeup + # make RPi users happy + if [ -e /proc/acpi/wakeup ] ; then + getlog_cmd cat /proc/acpi/wakeup + fi # Filesystem.log LOGFILE="08_Filesystem.log" From 235e07e15fa0a6aef0c58064a40fe559e9a6745e Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Tue, 14 Jan 2014 16:48:35 +0200 Subject: [PATCH 4/6] createlog: make rpi even happier --- packages/sysutils/busybox/scripts/createlog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sysutils/busybox/scripts/createlog b/packages/sysutils/busybox/scripts/createlog index e1ac910a8f..0baafdd255 100755 --- a/packages/sysutils/busybox/scripts/createlog +++ b/packages/sysutils/busybox/scripts/createlog @@ -33,7 +33,7 @@ getlog_cmd() { echo "# OpenELEC release: $RELEASE" >> $BASEDIR/$LOGDIR/$LOGFILE echo "# $GIT" >> $BASEDIR/$LOGDIR/$LOGFILE echo "################################################################################" >> $BASEDIR/$LOGDIR/$LOGFILE - $@ >> $BASEDIR/$LOGDIR/$LOGFILE + $@ >> $BASEDIR/$LOGDIR/$LOGFILE 2>/dev/null echo "" >> $BASEDIR/$LOGDIR/$LOGFILE fi } From 7ba8f3a5d1a8dd690de471bc5efcf3f85d4fd163 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Tue, 14 Jan 2014 16:50:40 +0200 Subject: [PATCH 5/6] samba: don't be a preferred/domain master closes #2882 --- packages/network/samba/config/smb.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/network/samba/config/smb.conf b/packages/network/samba/config/smb.conf index effa48c2e6..af110b6fdf 100644 --- a/packages/network/samba/config/smb.conf +++ b/packages/network/samba/config/smb.conf @@ -36,8 +36,8 @@ syslog only = yes syslog = 2 name resolve order = lmhosts wins bcast host - preferred master = yes - domain master = yes + preferred master = auto + domain master = auto local master = yes printcap name = /dev/null load printers = no From 6472b031eb11aae0d057598b996df6402eba6653 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Wed, 15 Jan 2014 00:02:00 +0200 Subject: [PATCH 6/6] linux: re-add CONFIG_KALLSYMS better keep this enabled for debugging. a slightly increased kernel size is not a big deal ref #2862 --- projects/ARCTIC_MC/linux/linux.x86_64.conf | 3 ++- projects/ATV/linux/linux.i386.conf | 3 ++- projects/Generic/linux/linux.i386.conf | 3 ++- projects/Generic/linux/linux.x86_64.conf | 3 ++- projects/RPi/linux/linux.arm.conf | 3 ++- projects/Virtual/linux/linux.i386.conf | 3 ++- projects/Virtual/linux/linux.x86_64.conf | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/projects/ARCTIC_MC/linux/linux.x86_64.conf b/projects/ARCTIC_MC/linux/linux.x86_64.conf index 194f84c7cf..e193aa8a17 100644 --- a/projects/ARCTIC_MC/linux/linux.x86_64.conf +++ b/projects/ARCTIC_MC/linux/linux.x86_64.conf @@ -176,7 +176,8 @@ CONFIG_HAVE_PCSPKR_PLATFORM=y CONFIG_EXPERT=y # CONFIG_UID16 is not set # CONFIG_SYSCTL_SYSCALL is not set -# CONFIG_KALLSYMS is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set CONFIG_PRINTK=y CONFIG_BUG=y # CONFIG_PCSPKR_PLATFORM is not set diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index 7b9bf4e845..71154487a2 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -154,7 +154,8 @@ CONFIG_HAVE_PCSPKR_PLATFORM=y CONFIG_EXPERT=y # CONFIG_UID16 is not set # CONFIG_SYSCTL_SYSCALL is not set -# CONFIG_KALLSYMS is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set CONFIG_PRINTK=y CONFIG_BUG=y # CONFIG_PCSPKR_PLATFORM is not set diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index b808b85153..868ca3b174 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -162,7 +162,8 @@ CONFIG_HAVE_PCSPKR_PLATFORM=y CONFIG_EXPERT=y # CONFIG_UID16 is not set # CONFIG_SYSCTL_SYSCALL is not set -# CONFIG_KALLSYMS is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set CONFIG_PRINTK=y CONFIG_BUG=y # CONFIG_PCSPKR_PLATFORM is not set diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf index b1029594ef..b7f2496377 100644 --- a/projects/Generic/linux/linux.x86_64.conf +++ b/projects/Generic/linux/linux.x86_64.conf @@ -176,7 +176,8 @@ CONFIG_HAVE_PCSPKR_PLATFORM=y CONFIG_EXPERT=y # CONFIG_UID16 is not set # CONFIG_SYSCTL_SYSCALL is not set -# CONFIG_KALLSYMS is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set CONFIG_PRINTK=y CONFIG_BUG=y # CONFIG_PCSPKR_PLATFORM is not set diff --git a/projects/RPi/linux/linux.arm.conf b/projects/RPi/linux/linux.arm.conf index 89d8888feb..6c349ceb65 100644 --- a/projects/RPi/linux/linux.arm.conf +++ b/projects/RPi/linux/linux.arm.conf @@ -136,7 +136,8 @@ CONFIG_HAVE_UID16=y CONFIG_EXPERT=y # CONFIG_UID16 is not set CONFIG_SYSCTL_SYSCALL=y -# CONFIG_KALLSYMS is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_BASE_FULL=y diff --git a/projects/Virtual/linux/linux.i386.conf b/projects/Virtual/linux/linux.i386.conf index 513f85f1d9..0f4835e01d 100644 --- a/projects/Virtual/linux/linux.i386.conf +++ b/projects/Virtual/linux/linux.i386.conf @@ -162,7 +162,8 @@ CONFIG_HAVE_PCSPKR_PLATFORM=y CONFIG_EXPERT=y # CONFIG_UID16 is not set # CONFIG_SYSCTL_SYSCALL is not set -# CONFIG_KALLSYMS is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set CONFIG_PRINTK=y CONFIG_BUG=y # CONFIG_PCSPKR_PLATFORM is not set diff --git a/projects/Virtual/linux/linux.x86_64.conf b/projects/Virtual/linux/linux.x86_64.conf index 62fe624a5f..d0db3a4540 100644 --- a/projects/Virtual/linux/linux.x86_64.conf +++ b/projects/Virtual/linux/linux.x86_64.conf @@ -176,7 +176,8 @@ CONFIG_HAVE_PCSPKR_PLATFORM=y CONFIG_EXPERT=y # CONFIG_UID16 is not set # CONFIG_SYSCTL_SYSCALL is not set -# CONFIG_KALLSYMS is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set CONFIG_PRINTK=y CONFIG_BUG=y # CONFIG_PCSPKR_PLATFORM is not set