pandora-libpnd: Refactor recipe and also tweak init scripts (simple & to spawn them...

diff --git a/recipes/pandora-system/pandora-libpnd.bb b/recipes/pandora-system/pandora-libpnd.bb
index ac14d07..b1e8b6a 100755 (executable)
--- a/recipes/pandora-system/pandora-libpnd.bb
+++ b/recipes/pandora-system/pandora-libpnd.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Support for the PND format in Pandora images (lib, daemon, init script etc.)"
 LICENSE = "lGPL"
 
-PR = "r15"
+PR = "r16"
 
 PARALLEL_MAKE = ""
 
@@ -12,7 +12,7 @@ SRC_URI = " \
           file://op_pnd_run.desktop \
 "
 
-SRCREV = "c92806d9595975c5111630f52eaa7ce2b83880a9"
+SRCREV = "9e728273fb455df55b1536ef5fb80f997dc6e2d7"
 
 S = "${WORKDIR}/git"
 
@@ -21,8 +21,20 @@ inherit update-rc.d
 TARGET_CC_ARCH += "${LDFLAGS}"
 TARGET_CFLAGS += "-Wall -I./include"
 
-INITSCRIPT_NAME = "pndnotifyd-init"
-INITSCRIPT_PARAMS = "start 30 5 3 . stop 40 0 1 6 ."
+PACKAGES =+ "${PN}-pndnotifyd ${PN}-pndevmapperd"
+
+RDEPENDS_${PN} += "${PN}-pndnotifyd ${PN}-pndevmapperd"
+
+INITSCRIPT_PACKAGES = "${PN}-pndnotifyd ${PN}-pndevmapperd"
+
+INITSCRIPT_NAME_${PN}-pndnotifyd = "pndnotifyd-init"
+INITSCRIPT_PARAMS_${PN}-pndnotifyd = "start 30 5 3 . stop 40 0 1 6 ."
+
+INITSCRIPT_NAME_${PN}-pndevmapperd = "pndevmapperd-init"
+INITSCRIPT_PARAMS_${PN}-pndevmapperd = "start 30 5 3 . stop 40 0 1 6 ."
+
+RDEPENDS_${PN}-pndnotifyd += "${PN}"
+RDEPENDS_${PN}-pndevmapperd += "${PN}"
 
 do_compile_prepend() {
           cd ${S}/
@@ -35,23 +47,24 @@ do_compile() {
 
 do_install() {
           install -d ${D}${sysconfdir}/pandora/conf/
-          install ${S}/deployment/etc/pandora/conf/apps ${D}${sysconfdir}/pandora/conf/apps
-          install ${S}/deployment/etc/pandora/conf/desktop ${D}${sysconfdir}/pandora/conf/desktop
-          install ${S}/deployment/etc/pandora/conf/categories ${D}${sysconfdir}/pandora/conf/categories
-          install ${S}/deployment/etc/pandora/conf/eventmap ${D}${sysconfdir}/pandora/conf/eventmap
+          install -m 0644 ${S}/deployment/etc/pandora/conf/apps ${D}${sysconfdir}/pandora/conf/apps
+          install -m 0644 ${S}/deployment/etc/pandora/conf/desktop ${D}${sysconfdir}/pandora/conf/desktop
+          install -m 0644 ${S}/deployment/etc/pandora/conf/categories ${D}${sysconfdir}/pandora/conf/categories
+          install -m 0644 ${S}/deployment/etc/pandora/conf/eventmap ${D}${sysconfdir}/pandora/conf/eventmap
           install -d ${D}${libdir}/
-          cp -pP ${S}/deployment/usr/lib/libpnd* ${D}${libdir}/
-          cp -pP ${S}/deployment/usr/lib/libpnd.so.1.0.1 ${D}${libdir}/libpnd.so.1
+          install -m 0644 ${S}/deployment/usr/lib/libpnd* ${D}${libdir}/
+          install -m 0644 ${S}/deployment/usr/lib/libpnd.so.1.0.1 ${D}${libdir}/libpnd.so.1
 
           install -d ${D}${bindir}/
           install -m 0755 ${S}/deployment/usr/bin/pndnotifyd ${D}${bindir}/pndnotifyd
           install -m 0755 ${S}/deployment/usr/bin/pndevmapperd ${D}${bindir}/pndevmapperd 
-          install -m 0755 ${S}/deployment/usr/bin/pndevmapperd ${D}${bindir}/pnd_run 
+          install -m 0755 ${S}/deployment/usr/bin/pnd_run ${D}${bindir}/pnd_run 
                    
           install -d ${D}${prefix}/pandora/
           install -d ${D}${prefix}/pandora/apps/
           install -d ${D}${prefix}/pandora/scripts/
-          cp -pP ${S}/deployment/usr/pandora/scripts/* ${D}${prefix}/pandora/scripts
+          install -m 0755 ${S}/deployment/usr/pandora/scripts/* ${D}${prefix}/pandora/scripts
+          install -m 0755 ${S}/testdata/scripts/* ${D}${prefix}/pandora/scripts
           
           install -d ${D}${sysconfdir}/init.d/
           install -m 0755 ${WORKDIR}/rc.pndnotifyd ${D}${sysconfdir}/init.d/pndnotifyd-init
@@ -63,11 +76,13 @@ do_install() {
           install -m 0644 ${S}/include/pnd* ${D}${includedir}/
           
           install -d ${D}${sysconfdir}/sudoers.d/
-          install -m 440 ${S}/testdata/sh/sudoers ${D}${sysconfdir}/sudoers.d/01_libpnd
+          install -m 440 ${S}/testdata/sh/sudoers ${D}${sysconfdir}/sudoers.d/99_libpnd
           
           install -d ${D}${datadir}/applications/
           install -m 0644 ${WORKDIR}/op_pnd_run.desktop ${D}${datadir}/applications/          
 }
 
 FILES_${PN} += "${bindir} ${sbindir} ${prefix}/pandora/*"
+FILES_${PN}-pndnotifyd = "${sysconfdir}/init.d/pndnotifyd-init ${bindir}/pndnotifyd"
+FILES_${PN}-pndevmapperd = "${sysconfdir}/init.d/pndevmapperd-init ${bindir}/pndevmapperd "
 FILES_${PN}-dev += "${libdir}/libpnd.a ${includedir}/pnd*"

diff --git a/recipes/pandora-system/pandora-libpnd/rc.pndevmapperd b/recipes/pandora-system/pandora-libpnd/rc.pndevmapperd
index e857ff2..c3072fb 100644 (file)
--- a/recipes/pandora-system/pandora-libpnd/rc.pndevmapperd
+++ b/recipes/pandora-system/pandora-libpnd/rc.pndevmapperd
@@ -44,7 +44,7 @@ d_reload() {
 case "$1" in
   start)
        echo -n "Starting $DESC: $NAME"
-       d_start
+       d_start &
        echo "."
        ;;
   stop)

diff --git a/recipes/pandora-system/pandora-libpnd/rc.pndnotifyd b/recipes/pandora-system/pandora-libpnd/rc.pndnotifyd
index 3dff46f..448279b 100644 (file)
--- a/recipes/pandora-system/pandora-libpnd/rc.pndnotifyd
+++ b/recipes/pandora-system/pandora-libpnd/rc.pndnotifyd
@@ -44,7 +44,7 @@ d_reload() {
 case "$1" in
   start)
        echo -n "Starting $DESC: $NAME"
-       d_start
+       d_start &
        echo "."
        ;;
   stop)