jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-06 09:27:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'openelec-systemd' of github.com:OpenELEC/OpenELEC.tv into openelec-systemd

Browse Source 
Conflicts:
	packages/x11/xserver/xorg-server/profile.d/xorg-server.conf
This commit is contained in:
Stephan Raue 2013-08-16 12:23:19 +02:00
commit 18637e2f38
13 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/initramfs/sysutils/busybox-initramfs/scripts/init
View File

@ -134,11 +134,7 @@
# Display fatal error message # Display fatal error message
# $1:action which caused error, $2:message # $1:action which caused error, $2:message
echo "*** Error in $BOOT_STEP: $1: $2 ***" echo "*** Error in $BOOT_STEP: $1: $2 ***"
if [ -z "$DEBUG" ]; then debug_shell
halt
else
debug_shell
fi
} }
break_after() { break_after() {

2
packages/network/bluez/package.mk
View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="bluez" PKG_NAME="bluez"
PKG_VERSION="5.7" PKG_VERSION="5.8"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"

2
projects/ARCTIC_MC/linux/linux.x86_64.conf
View File

@ -1865,7 +1865,7 @@ CONFIG_SENSORS_FAM15H_POWER=m
# CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL518SM is not set
# CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_GL520SM is not set
# CONFIG_SENSORS_HIH6130 is not set # CONFIG_SENSORS_HIH6130 is not set
CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_CORETEMP=y
CONFIG_SENSORS_IT87=m CONFIG_SENSORS_IT87=m
# CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_JC42 is not set
# CONFIG_SENSORS_LINEAGE is not set # CONFIG_SENSORS_LINEAGE is not set

2
projects/Generic/linux/linux.i386.conf
View File

@ -1890,7 +1890,7 @@ CONFIG_SENSORS_FAM15H_POWER=m
# CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL518SM is not set
# CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_GL520SM is not set
# CONFIG_SENSORS_HIH6130 is not set # CONFIG_SENSORS_HIH6130 is not set
CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_CORETEMP=y
CONFIG_SENSORS_IT87=m CONFIG_SENSORS_IT87=m
# CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_JC42 is not set
# CONFIG_SENSORS_LINEAGE is not set # CONFIG_SENSORS_LINEAGE is not set

2
projects/Generic/linux/linux.x86_64.conf
View File

@ -1866,7 +1866,7 @@ CONFIG_SENSORS_FAM15H_POWER=m
# CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL518SM is not set
# CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_GL520SM is not set
# CONFIG_SENSORS_HIH6130 is not set # CONFIG_SENSORS_HIH6130 is not set
CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_CORETEMP=y
CONFIG_SENSORS_IT87=m CONFIG_SENSORS_IT87=m
# CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_JC42 is not set
# CONFIG_SENSORS_LINEAGE is not set # CONFIG_SENSORS_LINEAGE is not set

2
projects/Generic_OSS/linux/linux.i386.conf
View File

@ -1888,7 +1888,7 @@ CONFIG_SENSORS_FAM15H_POWER=m
# CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL518SM is not set
# CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_GL520SM is not set
# CONFIG_SENSORS_HIH6130 is not set # CONFIG_SENSORS_HIH6130 is not set
CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_CORETEMP=y
CONFIG_SENSORS_IT87=m CONFIG_SENSORS_IT87=m
# CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_JC42 is not set
# CONFIG_SENSORS_LINEAGE is not set # CONFIG_SENSORS_LINEAGE is not set

2
projects/ION/linux/linux.i386.conf.deprecated
View File

@ -1818,7 +1818,7 @@ CONFIG_HWMON_VID=y
# CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL518SM is not set
# CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_GL520SM is not set
# CONFIG_SENSORS_HIH6130 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_IT87 is not set
# CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_JC42 is not set
# CONFIG_SENSORS_LINEAGE is not set # CONFIG_SENSORS_LINEAGE is not set

2
projects/ION/linux/linux.x86_64.conf
View File

@ -1762,7 +1762,7 @@ CONFIG_HWMON_VID=y
# CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL518SM is not set
# CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_GL520SM is not set
# CONFIG_SENSORS_HIH6130 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_IT87 is not set
# CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_JC42 is not set
# CONFIG_SENSORS_LINEAGE is not set # CONFIG_SENSORS_LINEAGE is not set

2
projects/Intel/linux/linux.i386.conf.deprecated
View File

@ -1836,7 +1836,7 @@ CONFIG_HWMON_VID=y
# CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL518SM is not set
# CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_GL520SM is not set
# CONFIG_SENSORS_HIH6130 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_IT87 is not set
# CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_JC42 is not set
# CONFIG_SENSORS_LINEAGE is not set # CONFIG_SENSORS_LINEAGE is not set

2
projects/Intel/linux/linux.x86_64.conf
View File

@ -1793,7 +1793,7 @@ CONFIG_HWMON_VID=y
# CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL518SM is not set
# CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_GL520SM is not set
# CONFIG_SENSORS_HIH6130 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_IT87 is not set
# CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_JC42 is not set
# CONFIG_SENSORS_LINEAGE is not set # CONFIG_SENSORS_LINEAGE is not set

2
projects/RPi/linux/linux.arm.conf
View File

@ -1072,7 +1072,7 @@ CONFIG_INPUT_MISC=y
# CONFIG_INPUT_POWERMATE is not set # CONFIG_INPUT_POWERMATE is not set
# CONFIG_INPUT_YEALINK is not set # CONFIG_INPUT_YEALINK is not set
# CONFIG_INPUT_CM109 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_PCF8574 is not set
# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
# CONFIG_INPUT_ADXL34X is not set # CONFIG_INPUT_ADXL34X is not set

2
projects/Virtual/linux/linux.i386.conf
View File

@ -1889,7 +1889,7 @@ CONFIG_SENSORS_FAM15H_POWER=m
# CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL518SM is not set
# CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_GL520SM is not set
# CONFIG_SENSORS_HIH6130 is not set # CONFIG_SENSORS_HIH6130 is not set
CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_CORETEMP=y
CONFIG_SENSORS_IT87=m CONFIG_SENSORS_IT87=m
# CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_JC42 is not set
# CONFIG_SENSORS_LINEAGE is not set # CONFIG_SENSORS_LINEAGE is not set

2
projects/Virtual/linux/linux.x86_64.conf
View File

@ -1865,7 +1865,7 @@ CONFIG_SENSORS_FAM15H_POWER=m
# CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL518SM is not set
# CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_GL520SM is not set
# CONFIG_SENSORS_HIH6130 is not set # CONFIG_SENSORS_HIH6130 is not set
CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_CORETEMP=y
CONFIG_SENSORS_IT87=m CONFIG_SENSORS_IT87=m
# CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_JC42 is not set
# CONFIG_SENSORS_LINEAGE is not set # CONFIG_SENSORS_LINEAGE is not set