From f0a4e9255d333d636f8c976009fc4093162d1f7f Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Sat, 5 Nov 2011 08:40:20 +0100
Subject: [PATCH] angstrom-led-config: rename to led-config

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 .../angstrom/angstrom-led-config/led-config   | 31 ----------------
 .../leds/led-config.bb                        | 25 +++++++------
 .../leds/led-config}/at32stk1000/leds         |  0
 .../leds/led-config}/beagleboard/leds         |  0
 recipes-core/leds/led-config/beaglebone/leds  |  2 ++
 .../leds/led-config}/cm-t35/leds              |  0
 recipes-core/leds/led-config/led-config       | 35 +++++++++++++++++++
 .../leds/led-config}/leds                     |  0
 recipes-core/leds/led-config/leds.service     | 12 +++++++
 .../leds/led-config}/omap3-pandora/leds       |  0
 .../leds/led-config}/omap4430-panda/leds      |  0
 .../leds/led-config}/sheevaplug/leds          |  0
 .../leds/led-config}/ts72xx/leds              |  0
 13 files changed, 64 insertions(+), 41 deletions(-)
 delete mode 100755 recipes-angstrom/angstrom/angstrom-led-config/led-config
 rename recipes-angstrom/angstrom/angstrom-led-config.bb => recipes-core/leds/led-config.bb (53%)
 rename {recipes-angstrom/angstrom/angstrom-led-config => recipes-core/leds/led-config}/at32stk1000/leds (100%)
 rename {recipes-angstrom/angstrom/angstrom-led-config => recipes-core/leds/led-config}/beagleboard/leds (100%)
 create mode 100644 recipes-core/leds/led-config/beaglebone/leds
 rename {recipes-angstrom/angstrom/angstrom-led-config => recipes-core/leds/led-config}/cm-t35/leds (100%)
 create mode 100755 recipes-core/leds/led-config/led-config
 rename {recipes-angstrom/angstrom/angstrom-led-config => recipes-core/leds/led-config}/leds (100%)
 create mode 100644 recipes-core/leds/led-config/leds.service
 rename {recipes-angstrom/angstrom/angstrom-led-config => recipes-core/leds/led-config}/omap3-pandora/leds (100%)
 rename {recipes-angstrom/angstrom/angstrom-led-config => recipes-core/leds/led-config}/omap4430-panda/leds (100%)
 rename {recipes-angstrom/angstrom/angstrom-led-config => recipes-core/leds/led-config}/sheevaplug/leds (100%)
 rename {recipes-angstrom/angstrom/angstrom-led-config => recipes-core/leds/led-config}/ts72xx/leds (100%)

diff --git a/recipes-angstrom/angstrom/angstrom-led-config/led-config b/recipes-angstrom/angstrom/angstrom-led-config/led-config
deleted file mode 100755
index 63d52d6..0000000
--- a/recipes-angstrom/angstrom/angstrom-led-config/led-config
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh
-
-if [ -e /sys/class/leds/ ] ; then
- 
-case "$1" in
-  start)
-       echo "Configuring leds:"
-       for led in /sys/class/leds/* ; do
-	trigger=$(grep "$(basename $led)" /etc/default/leds | awk '{print $2}')
-	if [ "x$trigger" = "x" ] ; then trigger="none" ; fi 
-	echo "  $(basename $led): $trigger"
-        echo "$trigger" > "$led/trigger"
-       done
-;;
-  stop)
-       echo "Deconfiguring leds:"
-       for led in /sys/class/leds/* ; do
-	echo "  $(basename $led): no trigger" 
-	echo "none" > "$led/trigger"	
-       done
-       ;;
-  *)
-       echo "Usage: /etc/init.d/led-config {start|stop}"
-       exit 1
-esac
-
-else
-	echo "No LEDs detected"
-fi
-
-exit 0                                                                         
diff --git a/recipes-angstrom/angstrom/angstrom-led-config.bb b/recipes-core/leds/led-config.bb
similarity index 53%
rename from recipes-angstrom/angstrom/angstrom-led-config.bb
rename to recipes-core/leds/led-config.bb
index 0518985..81a65b8 100644
--- a/recipes-angstrom/angstrom/angstrom-led-config.bb
+++ b/recipes-core/leds/led-config.bb
@@ -2,16 +2,15 @@ DESCRIPTION = "Configuration files for runtime LED configuration"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
 
-#PV = "${DISTRO_VERSION}"
-PR = "r9"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
+inherit systemd
 
-inherit update-rc.d
-INITSCRIPT_NAME = "led-config"
-INITSCRIPT_PARAMS = "defaults 05"
+#PV = "${DISTRO_VERSION}"
+PR = "r12"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 SRC_URI = "file://led-config \
            file://leds \
+           file://leds.service \
           "	
 
 do_compile() {
@@ -20,14 +19,20 @@ do_compile() {
 
 
 do_install () {
-        install -d ${D}/${sysconfdir}/default
-	install -d ${D}/${INIT_D_DIR}
+	install -d ${D}/${sysconfdir}/default
+	install -d ${D}/${bindir}
 
 	install -m 0644 ${WORKDIR}/leds ${D}/${sysconfdir}/default/
-	install -m 0755 ${WORKDIR}/led-config ${D}/${INIT_D_DIR}
+	install -m 0755 ${WORKDIR}/led-config ${D}/${bindir}
+
+	install -d ${D}/${base_libdir}/systemd/system
+	install -m 0644 ${WORKDIR}/leds.service ${D}/${base_libdir}/systemd/system/
 }
 
+SYSTEMD_PACKAGES = "${PN}"
+SYSTEMD_SERVICE_${PN} = "leds.service"
+
+FILES_${PN} += "${base_libdir}/systemd"
 CONFFILES_${PN} += "${sysconfdir}/default/leds \
-                    ${INIT_D_DIR}/led-config \
                    "
 
diff --git a/recipes-angstrom/angstrom/angstrom-led-config/at32stk1000/leds b/recipes-core/leds/led-config/at32stk1000/leds
similarity index 100%
rename from recipes-angstrom/angstrom/angstrom-led-config/at32stk1000/leds
rename to recipes-core/leds/led-config/at32stk1000/leds
diff --git a/recipes-angstrom/angstrom/angstrom-led-config/beagleboard/leds b/recipes-core/leds/led-config/beagleboard/leds
similarity index 100%
rename from recipes-angstrom/angstrom/angstrom-led-config/beagleboard/leds
rename to recipes-core/leds/led-config/beagleboard/leds
diff --git a/recipes-core/leds/led-config/beaglebone/leds b/recipes-core/leds/led-config/beaglebone/leds
new file mode 100644
index 0000000..dada93e
--- /dev/null
+++ b/recipes-core/leds/led-config/beaglebone/leds
@@ -0,0 +1,2 @@
+#file format: name trigger
+beaglebone::usr0 heartbeat
diff --git a/recipes-angstrom/angstrom/angstrom-led-config/cm-t35/leds b/recipes-core/leds/led-config/cm-t35/leds
similarity index 100%
rename from recipes-angstrom/angstrom/angstrom-led-config/cm-t35/leds
rename to recipes-core/leds/led-config/cm-t35/leds
diff --git a/recipes-core/leds/led-config/led-config b/recipes-core/leds/led-config/led-config
new file mode 100755
index 0000000..b4703cf
--- /dev/null
+++ b/recipes-core/leds/led-config/led-config
@@ -0,0 +1,35 @@
+#! /bin/sh
+
+if [ -e /sys/class/leds/ ] ; then
+ 
+case "$1" in
+  start)
+	echo "Configuring leds:"
+	for led in /sys/class/leds/* ; do
+		trigger=$(grep "$(basename $led)" /etc/default/leds | awk '{print $2}')
+		if [ -n "$trigger" ] ; then
+			echo "  $(basename $led): $trigger"
+			echo "$trigger" > "$led/trigger"
+		fi
+	done
+;;
+  stop)
+	echo "Deconfiguring leds:"
+	for led in /sys/class/leds/* ; do
+		trigger=$(grep "$(basename $led)" /etc/default/leds | awk '{print $2}')
+		if [ -n "$trigger" ] ; then
+			echo "  $(basename $led): no trigger" 
+			echo "none" > "$led/trigger"
+		fi	
+       done
+       ;;
+  *)
+       echo "Usage: /etc/init.d/led-config {start|stop}"
+       exit 1
+esac
+
+else
+	echo "No LEDs detected"
+fi
+
+exit 0                                                                         
diff --git a/recipes-angstrom/angstrom/angstrom-led-config/leds b/recipes-core/leds/led-config/leds
similarity index 100%
rename from recipes-angstrom/angstrom/angstrom-led-config/leds
rename to recipes-core/leds/led-config/leds
diff --git a/recipes-core/leds/led-config/leds.service b/recipes-core/leds/led-config/leds.service
new file mode 100644
index 0000000..e7fa78d
--- /dev/null
+++ b/recipes-core/leds/led-config/leds.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Angstrom LED config
+ConditionPathExists=|/sys/class/leds
+After=remount-rootfs.service
+
+[Service]
+RemainAfterExit=yes
+ExecStart=/usr/bin/led-config start
+ExecStop=/usr/bin/led-config stop
+
+[Install]
+WantedBy=basic.target
diff --git a/recipes-angstrom/angstrom/angstrom-led-config/omap3-pandora/leds b/recipes-core/leds/led-config/omap3-pandora/leds
similarity index 100%
rename from recipes-angstrom/angstrom/angstrom-led-config/omap3-pandora/leds
rename to recipes-core/leds/led-config/omap3-pandora/leds
diff --git a/recipes-angstrom/angstrom/angstrom-led-config/omap4430-panda/leds b/recipes-core/leds/led-config/omap4430-panda/leds
similarity index 100%
rename from recipes-angstrom/angstrom/angstrom-led-config/omap4430-panda/leds
rename to recipes-core/leds/led-config/omap4430-panda/leds
diff --git a/recipes-angstrom/angstrom/angstrom-led-config/sheevaplug/leds b/recipes-core/leds/led-config/sheevaplug/leds
similarity index 100%
rename from recipes-angstrom/angstrom/angstrom-led-config/sheevaplug/leds
rename to recipes-core/leds/led-config/sheevaplug/leds
diff --git a/recipes-angstrom/angstrom/angstrom-led-config/ts72xx/leds b/recipes-core/leds/led-config/ts72xx/leds
similarity index 100%
rename from recipes-angstrom/angstrom/angstrom-led-config/ts72xx/leds
rename to recipes-core/leds/led-config/ts72xx/leds