[oe-commits] org.oe.dev merge of '3506b9987e9cac2db68bfd55cff9ee2f989aa053'

[oe commit]

merge of '3506b9987e9cac2db68bfd55cff9ee2f989aa053'
     and '387792ddbaa8e8b90a0c30519d749b13371a81b6'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: c716057d3f127e0d43c324fc5f799d0ed94cffa9
ViewMTN: http://monotone.openembedded.org/revision/info/c716057d3f127e0d43c324fc5f799d0ed94cffa9
Files:
1
packages/slugos-init/files/leds
packages/slugos-init/slugos-init_4.8.bb
packages/rsync/rsync_2.6.9.bb
Diffs:

#
# mt diff -r3506b9987e9cac2db68bfd55cff9ee2f989aa053 -rc716057d3f127e0d43c324fc5f799d0ed94cffa9
#
#
#
# patch "packages/slugos-init/files/leds"
#  from [24aa798d8ca8877e75d2307dff73aedb6e7d107a]
#    to [a8c1cfca1b8aa19ac2ec92d4835b46b680b1b2fe]
# 
# patch "packages/slugos-init/slugos-init_4.8.bb"
#  from [d527fb3796c109605dc769795fc18fb7f0c2e066]
#    to [75e3e3bbb749ba3ed4b9dd416c48f960db65b58f]
#
============================================================
--- packages/slugos-init/files/leds	24aa798d8ca8877e75d2307dff73aedb6e7d107a
+++ packages/slugos-init/files/leds	a8c1cfca1b8aa19ac2ec92d4835b46b680b1b2fe
@@ -81,8 +81,8 @@ sysled_readystatus(){
 		esac;;
 	esac
 
-	led_set "$1/ready" "$ready"
-	led_set "$1/status" "$status"
+	led_set "$1/$ready_led_name" "$ready"
+	led_set "$1/$status_led_name" "$status"
 }
 #
 # the cases for one LED (just ready)
@@ -104,7 +104,7 @@ sysled_ready(){
 		esac;;
 	esac
 
-	led_set "$1/ready" "$ready"
+	led_set "$1/$ready_led_name" "$ready"
 }
 #
 # the cases for one blue flashing LED (just power)
@@ -126,7 +126,7 @@ sysled_power(){
 		esac;;
 	esac
 
-	led_set "$1/power" "$power"
+	led_set "$1/$power_led_name" "$power"
 }
 #
 sysled(){
@@ -154,16 +154,16 @@ sysled(){
 	fi
 	#
 	# check for the 'ready' LED - otherwise check for a 'power' LED
-	if test -d "$mp/class/leds/ready"
+	if test -d "$mp/class/leds/$ready_led_name"
 	then
-		if test -d "$mp/class/leds/status"
+		if test -d "$mp/class/leds/$status_led_name"
 		then
 			sysled_readystatus "$mp/class/leds" $boot"$@"
 		else
 			sysled_ready "$mp/class/leds" $boot"$@"
 		fi
 	else
-		if test -d "$mp/class/leds/power"
+		if test -d "$mp/class/leds/$power_led_name"
 		then
 			sysled_power "$mp/class/leds" $boot"$@"
 		fi
@@ -211,7 +211,37 @@ leds_help(){
 	echo "    if possible cause the machine to emit a beep" >&2
 }
 
-#
+# Define the LED names based on kernel version.
+version=$(uname -r | cut -c -6)
+if [ "$version" \< "2.6.25" ]; then
+	status_led_name="status"
+	ready_led_name="ready"
+	power_led_name="power"
+else
+	case "$(machine)" in
+	dsmg600)
+		status_led_name="none"
+		ready_led_name="none"
+		power_led_name="dsmg600:green:power"
+		;;
+	fsg3)
+		status_led_name="none"
+		ready_led_name="fsg:blue:sync"
+		power_led_name="none"
+		;;
+	nas100d)
+		status_led_name="none"
+		ready_led_name="none"
+		power_led_name="nas100d:blue:power"
+		;;
+	nslu2)
+		status_led_name="nslu2:red:status"
+		ready_led_name="nslu2:green:ready"
+		power_led_name="none"
+		;;
+	esac
+fi
+
 # the real command, if required
 case "$1" in
 boot|system|user|singleuser|shutdown)
============================================================
--- packages/slugos-init/slugos-init_4.8.bb	d527fb3796c109605dc769795fc18fb7f0c2e066
+++ packages/slugos-init/slugos-init_4.8.bb	75e3e3bbb749ba3ed4b9dd416c48f960db65b58f
@@ -4,7 +4,7 @@ RDEPENDS = "busybox devio"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "file://boot/flash \
 	   file://boot/disk \


#
# mt diff -r387792ddbaa8e8b90a0c30519d749b13371a81b6 -rc716057d3f127e0d43c324fc5f799d0ed94cffa9
#
#
#
# patch "packages/rsync/rsync_2.6.9.bb"
#  from [c04a11b738d476c5a38376838a0c9a42a41cc5b4]
#    to [46d56c1ae65397da35a2b8871cfecde62e0a382e]
#
============================================================
--- packages/rsync/rsync_2.6.9.bb	c04a11b738d476c5a38376838a0c9a42a41cc5b4
+++ packages/rsync/rsync_2.6.9.bb	46d56c1ae65397da35a2b8871cfecde62e0a382e
@@ -1,6 +1,6 @@ require rsync.inc
 require rsync.inc
 
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "http://rsync.samba.org/ftp/old-versions/rsync/rsync-${PV}.tar.gz \
+SRC_URI = "http://rsync.samba.org/ftp/rsync/old-versions/rsync-${PV}.tar.gz \
            file://rsyncd.conf"