From 54e0891b618c687610b3f8e15404f3fe9136e924 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 15 Aug 2013 17:50:16 +0300 Subject: [PATCH 1/5] bluez: update to bluez-5.8 --- packages/network/bluez/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/network/bluez/package.mk b/packages/network/bluez/package.mk index 4f8f0d0430..9a23f3ca51 100644 --- a/packages/network/bluez/package.mk +++ b/packages/network/bluez/package.mk @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="bluez" -PKG_VERSION="5.7" +PKG_VERSION="5.8" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 5400e261169712bf9adc517e1c478adddcb949b3 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 15 Aug 2013 18:55:41 +0200 Subject: [PATCH 2/5] projects/RPi/linux: statically buildin uinput driver Signed-off-by: Stephan Raue --- projects/RPi/linux/linux.arm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/RPi/linux/linux.arm.conf b/projects/RPi/linux/linux.arm.conf index 7d4fe2e870..09b642ab2d 100644 --- a/projects/RPi/linux/linux.arm.conf +++ b/projects/RPi/linux/linux.arm.conf @@ -1063,7 +1063,7 @@ CONFIG_INPUT_MISC=y # CONFIG_INPUT_POWERMATE is not set # CONFIG_INPUT_YEALINK is not set # CONFIG_INPUT_CM109 is not set -CONFIG_INPUT_UINPUT=m +CONFIG_INPUT_UINPUT=y # CONFIG_INPUT_PCF8574 is not set # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set # CONFIG_INPUT_ADXL34X is not set From 07c5840e8dbff4abf9266dc006fd3ad06f186736 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 15 Aug 2013 19:04:22 +0200 Subject: [PATCH 3/5] projects/*/linux: statically buildin coretemp driver Signed-off-by: Stephan Raue --- projects/ARCTIC_MC/linux/linux.x86_64.conf | 2 +- projects/Generic/linux/linux.i386.conf | 2 +- projects/Generic/linux/linux.x86_64.conf | 2 +- projects/Generic_OSS/linux/linux.i386.conf | 2 +- projects/ION/linux/linux.i386.conf.deprecated | 2 +- projects/ION/linux/linux.x86_64.conf | 2 +- projects/Intel/linux/linux.i386.conf.deprecated | 2 +- projects/Intel/linux/linux.x86_64.conf | 2 +- projects/Virtual/linux/linux.i386.conf | 2 +- projects/Virtual/linux/linux.x86_64.conf | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/projects/ARCTIC_MC/linux/linux.x86_64.conf b/projects/ARCTIC_MC/linux/linux.x86_64.conf index df33e0a9b1..1237c7cde9 100644 --- a/projects/ARCTIC_MC/linux/linux.x86_64.conf +++ b/projects/ARCTIC_MC/linux/linux.x86_64.conf @@ -1855,7 +1855,7 @@ CONFIG_SENSORS_FAM15H_POWER=m # CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_HIH6130 is not set -CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_CORETEMP=y CONFIG_SENSORS_IT87=m # CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_LINEAGE is not set diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index e0f97691fc..4c50dc6a0d 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -1880,7 +1880,7 @@ CONFIG_SENSORS_FAM15H_POWER=m # CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_HIH6130 is not set -CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_CORETEMP=y CONFIG_SENSORS_IT87=m # CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_LINEAGE is not set diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf index 4d369a5c27..5ca8bdab66 100644 --- a/projects/Generic/linux/linux.x86_64.conf +++ b/projects/Generic/linux/linux.x86_64.conf @@ -1856,7 +1856,7 @@ CONFIG_SENSORS_FAM15H_POWER=m # CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_HIH6130 is not set -CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_CORETEMP=y CONFIG_SENSORS_IT87=m # CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_LINEAGE is not set diff --git a/projects/Generic_OSS/linux/linux.i386.conf b/projects/Generic_OSS/linux/linux.i386.conf index 6b839f6805..af2835537b 100644 --- a/projects/Generic_OSS/linux/linux.i386.conf +++ b/projects/Generic_OSS/linux/linux.i386.conf @@ -1878,7 +1878,7 @@ CONFIG_SENSORS_FAM15H_POWER=m # CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_HIH6130 is not set -CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_CORETEMP=y CONFIG_SENSORS_IT87=m # CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_LINEAGE is not set diff --git a/projects/ION/linux/linux.i386.conf.deprecated b/projects/ION/linux/linux.i386.conf.deprecated index 2b1821f9a0..bad8fb406a 100644 --- a/projects/ION/linux/linux.i386.conf.deprecated +++ b/projects/ION/linux/linux.i386.conf.deprecated @@ -1808,7 +1808,7 @@ CONFIG_HWMON_VID=y # CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_HIH6130 is not set -CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_CORETEMP=y # CONFIG_SENSORS_IT87 is not set # CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_LINEAGE is not set diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index dbe731c5cc..8d3f3cf3e4 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -1752,7 +1752,7 @@ CONFIG_HWMON_VID=y # CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_HIH6130 is not set -CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_CORETEMP=y # CONFIG_SENSORS_IT87 is not set # CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_LINEAGE is not set diff --git a/projects/Intel/linux/linux.i386.conf.deprecated b/projects/Intel/linux/linux.i386.conf.deprecated index 74a7fb69f3..b786462907 100644 --- a/projects/Intel/linux/linux.i386.conf.deprecated +++ b/projects/Intel/linux/linux.i386.conf.deprecated @@ -1826,7 +1826,7 @@ CONFIG_HWMON_VID=y # CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_HIH6130 is not set -CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_CORETEMP=y # CONFIG_SENSORS_IT87 is not set # CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_LINEAGE is not set diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index c9269e92db..fc7ecfa497 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -1783,7 +1783,7 @@ CONFIG_HWMON_VID=y # CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_HIH6130 is not set -CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_CORETEMP=y # CONFIG_SENSORS_IT87 is not set # CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_LINEAGE is not set diff --git a/projects/Virtual/linux/linux.i386.conf b/projects/Virtual/linux/linux.i386.conf index 7097df3df7..4549278bb4 100644 --- a/projects/Virtual/linux/linux.i386.conf +++ b/projects/Virtual/linux/linux.i386.conf @@ -1879,7 +1879,7 @@ CONFIG_SENSORS_FAM15H_POWER=m # CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_HIH6130 is not set -CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_CORETEMP=y CONFIG_SENSORS_IT87=m # CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_LINEAGE is not set diff --git a/projects/Virtual/linux/linux.x86_64.conf b/projects/Virtual/linux/linux.x86_64.conf index df33e0a9b1..1237c7cde9 100644 --- a/projects/Virtual/linux/linux.x86_64.conf +++ b/projects/Virtual/linux/linux.x86_64.conf @@ -1855,7 +1855,7 @@ CONFIG_SENSORS_FAM15H_POWER=m # CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_HIH6130 is not set -CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_CORETEMP=y CONFIG_SENSORS_IT87=m # CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_LINEAGE is not set From c68eb5ea87c01b7f7904bd42fb8e3eb6b42921ca Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 15 Aug 2013 19:08:23 +0200 Subject: [PATCH 4/5] linux: dont try to load 'coretemp' module Signed-off-by: Stephan Raue --- packages/linux/config/modules | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/linux/config/modules b/packages/linux/config/modules index 00dba836e4..36b7731525 100644 --- a/packages/linux/config/modules +++ b/packages/linux/config/modules @@ -2,5 +2,3 @@ # # This file contains the names of kernel modules that should be loaded # at boot time, one per line. Lines beginning with "#" are ignored. - -coretemp From ee9b463d05a6f367f5902e54bc38d2a5c823d9c1 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 15 Aug 2013 21:12:07 +0300 Subject: [PATCH 5/5] init: always spawn debugshell on fatal errors --- packages/initramfs/sysutils/busybox-initramfs/scripts/init | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/initramfs/sysutils/busybox-initramfs/scripts/init b/packages/initramfs/sysutils/busybox-initramfs/scripts/init index 04104c6f09..d897d08da8 100755 --- a/packages/initramfs/sysutils/busybox-initramfs/scripts/init +++ b/packages/initramfs/sysutils/busybox-initramfs/scripts/init @@ -129,11 +129,7 @@ # Display fatal error message # $1:action which caused error, $2:message echo "*** Error in $BOOT_STEP: $1: $2 ***" - if [ -z "$DEBUG" ]; then - halt - else - debug_shell - fi + debug_shell } break_after() {