[oe-commits] Paul Eggleton : opie-taskbar: tidy up installation of configuration files

[git version control]

Module: openembedded.git
Branch: master
Commit: 6cff68572fa4e50b2f7582c4a4cdc420ebccb304
URL:    http://git.openembedded.org/?p=openembedded.git&a=commit;h=6cff68572fa4e50b2f7582c4a4cdc420ebccb304

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Sat Jun  4 13:40:37 2011 +0100

opie-taskbar: tidy up installation of configuration files

* Remove OE copy of 03opiesignal file and use one from Opie source instead
* Move do_install parts to .inc file now that 1.2.4 has been removed

Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>

---

 recipes/opie-taskbar/opie-taskbar.inc          |    4 ++++
 recipes/opie-taskbar/opie-taskbar/03opiesignal |   11 -----------
 recipes/opie-taskbar/opie-taskbar_1.2.5.bb     |    9 +--------
 recipes/opie-taskbar/opie-taskbar_cvs.bb       |    9 +--------
 4 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/recipes/opie-taskbar/opie-taskbar.inc b/recipes/opie-taskbar/opie-taskbar.inc
index 6ebd42e..14a65b2 100644
--- a/recipes/opie-taskbar/opie-taskbar.inc
+++ b/recipes/opie-taskbar/opie-taskbar.inc
@@ -56,6 +56,10 @@ do_install() {
 
         install -d ${D}${includedir}
         install obexinterface.h ${D}${includedir}/
+        
+        install -d ${D}${sysconfdir}/apm/event.d/
+        install -m 0755 ${WORKDIR}/etc/03opiesignal ${D}${sysconfdir}/apm/event.d/
+        install -m 0644 ${WORKDIR}/etc/opie_sysevents.conf ${D}${sysconfdir}/
 }
 
 FILES_opie-taskbar_append = " ${sysconfdir} ${palmtopdir}/apps ${palmtopdir}/pics"
diff --git a/recipes/opie-taskbar/opie-taskbar/03opiesignal b/recipes/opie-taskbar/opie-taskbar/03opiesignal
deleted file mode 100644
index 31da587..0000000
--- a/recipes/opie-taskbar/opie-taskbar/03opiesignal
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-export QTDIR=/usr/lib/opie
-if [ "$1" = "suspend" ]; then
-	/usr/bin/qcop QPE/System systemSuspend\(\)
-elif [ "$1" = "resume" ] && [ "$2" != "standby" ]; then
-	/usr/bin/qcop QPE/System systemResume\(\)
-fi
-
-: exit 0
-
diff --git a/recipes/opie-taskbar/opie-taskbar_1.2.5.bb b/recipes/opie-taskbar/opie-taskbar_1.2.5.bb
index 52f31ab..ee01b35 100644
--- a/recipes/opie-taskbar/opie-taskbar_1.2.5.bb
+++ b/recipes/opie-taskbar/opie-taskbar_1.2.5.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://sources.openembedded.org/opie-1.2.5-split_core_apps_calibrate.tar.bz2;name=split_core_apps_calibrate \
            http://sources.openembedded.org/opie-1.2.5-split_noncore_settings_mediummount.tar.bz2;name=split_noncore_settings_mediummount \
@@ -15,7 +15,6 @@ SRC_URI = "http://sources.openembedded.org/opie-1.2.5-split_core_apps_calibrate.
            file://server-pro-cvs.patch \
            file://firstuse-path.patch \
            file://force-firstuse-calibrate.patch \
-           file://03opiesignal \
           "
 SRC_URI[split_core_apps_calibrate.md5sum] = "ee5e06b781e92f01271d883f91f101b0"
 SRC_URI[split_core_apps_calibrate.sha256sum] = "5e0164a195a166fd15451164edf8a44d8f3a9f81dcf3edc3a8975f24bd4b45b6"
@@ -32,9 +31,3 @@ SRC_URI[split_root.sha256sum] = "0fb78622bb7ab459860aaa65fbea6145c45141195c19811
 SRC_URI[split_etc.md5sum] = "74ef523ef12e242155bbb745072434d9"
 SRC_URI[split_etc.sha256sum] = "eef55ea2248b4f45f3a07beb6012e431dd71d4eefa134d39cc50b4d194c53087"
 
-do_install_append() {
-	install -d ${D}${bindir} ${D}${sysconfdir}/apm/event.d/
-	install -m 0755 ${WORKDIR}/03opiesignal ${D}${sysconfdir}/apm/event.d/
-	install -m 0644 ${WORKDIR}/etc/opie_sysevents.conf ${D}${sysconfdir}/
-}
-
diff --git a/recipes/opie-taskbar/opie-taskbar_cvs.bb b/recipes/opie-taskbar/opie-taskbar_cvs.bb
index 20fc6e8..9036e72 100644
--- a/recipes/opie-taskbar/opie-taskbar_cvs.bb
+++ b/recipes/opie-taskbar/opie-taskbar_cvs.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 PV = "${OPIE_GIT_PV}"
-PR = "r21"
+PR = "r22"
 
 SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/apps/calibrate \
            ${OPIE_GIT};protocol=git;subpath=noncore/settings/mediummount \
@@ -16,12 +16,5 @@ SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/apps/calibrate \
            file://server-pro-cvs.patch \
            file://firstuse-path.patch \
            file://force-firstuse-calibrate.patch \
-           file://03opiesignal \
           "
 
-do_install_append() {
-	install -d ${D}${bindir} ${D}${sysconfdir}/apm/event.d/
-	install -m 0755 ${WORKDIR}/03opiesignal ${D}${sysconfdir}/apm/event.d/
-	install -m 0644 ${WORKDIR}/etc/opie_sysevents.conf ${D}${sysconfdir}/
-}
-