OPIE applets: fix postinst() to not be used during image create

- usage of "pidof -s qpe" is useless on build machine and make dead processes here
- close bug #309
- creation of postinst()/postrm() should be moved to opie.bbclass

diff --git a/packages/opie-batteryapplet/opie-batteryapplet.inc b/packages/opie-batteryapplet/opie-batteryapplet.inc
index bac400d..3df9f40 100644 (file)
--- a/packages/opie-batteryapplet/opie-batteryapplet.inc
+++ b/packages/opie-batteryapplet/opie-batteryapplet.inc
@@ -12,12 +12,12 @@ inherit opie
 
 pkg_postinst() {
 #!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
 if pidof -s qpe >/dev/null; then
   /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
 else
   exit 0
 fi
- if [ -n "$D" ]; then false; fi
 }
 
 pkg_postrm() {

diff --git a/packages/opie-batteryapplet/opie-batteryapplet_1.2.1.bb b/packages/opie-batteryapplet/opie-batteryapplet_1.2.1.bb
index cb561d8..3feba24 100644 (file)
--- a/packages/opie-batteryapplet/opie-batteryapplet_1.2.1.bb
+++ b/packages/opie-batteryapplet/opie-batteryapplet_1.2.1.bb
@@ -1,6 +1,6 @@
 include ${PN}.inc
-    
- 
+
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/batteryapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \

diff --git a/packages/opie-batteryapplet/opie-batteryapplet_cvs.bb b/packages/opie-batteryapplet/opie-batteryapplet_cvs.bb
index 3260d80..a092b79 100644 (file)
--- a/packages/opie-batteryapplet/opie-batteryapplet_cvs.bb
+++ b/packages/opie-batteryapplet/opie-batteryapplet_cvs.bb
@@ -1,6 +1,7 @@
 include ${PN}.inc
-    
+
 PV = "1.2.1+cvs-${CVSDATE}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/batteryapplet \
            ${HANDHELDS_CVS};module=opie/pics \

diff --git a/packages/opie-clipboardapplet/opie-clipboardapplet.inc b/packages/opie-clipboardapplet/opie-clipboardapplet.inc
index 03d75be..b0340c0 100644 (file)
--- a/packages/opie-clipboardapplet/opie-clipboardapplet.inc
+++ b/packages/opie-clipboardapplet/opie-clipboardapplet.inc
@@ -12,10 +12,10 @@ inherit opie
 
 pkg_postinst() {
 #!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
 if pidof -s qpe >/dev/null; then
   /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
 fi
- if [ -n "$D" ]; then false; fi
 }
 
 pkg_postrm() {

diff --git a/packages/opie-clipboardapplet/opie-clipboardapplet_1.2.1.bb b/packages/opie-clipboardapplet/opie-clipboardapplet_1.2.1.bb
index b799edf..a9d681b 100644 (file)
--- a/packages/opie-clipboardapplet/opie-clipboardapplet_1.2.1.bb
+++ b/packages/opie-clipboardapplet/opie-clipboardapplet_1.2.1.bb
@@ -1,6 +1,6 @@
 include ${PN}.inc
-    
- 
+
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/clipboardapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \

diff --git a/packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb b/packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb
index 4c204aa..4c63f7c 100644 (file)
--- a/packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb
+++ b/packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb
@@ -1,6 +1,7 @@
 include ${PN}.inc
-    
+
 PV = "1.2.1+cvs-${CVSDATE}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/clipboardapplet \
            ${HANDHELDS_CVS};module=opie/pics \

diff --git a/packages/opie-clockapplet/opie-clockapplet.inc b/packages/opie-clockapplet/opie-clockapplet.inc
index c312b1f..ddf4d92 100644 (file)
--- a/packages/opie-clockapplet/opie-clockapplet.inc
+++ b/packages/opie-clockapplet/opie-clockapplet.inc
@@ -12,10 +12,10 @@ inherit opie
 
 pkg_postinst() {
 #!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
 if pidof -s qpe >/dev/null; then
   /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
 fi
- if [ -n "$D" ]; then false; fi
 }
 
 pkg_postrm() {

diff --git a/packages/opie-clockapplet/opie-clockapplet_1.2.1.bb b/packages/opie-clockapplet/opie-clockapplet_1.2.1.bb
index e315cd4..9d4dfa7 100644 (file)
--- a/packages/opie-clockapplet/opie-clockapplet_1.2.1.bb
+++ b/packages/opie-clockapplet/opie-clockapplet_1.2.1.bb
@@ -1,6 +1,6 @@
 include ${PN}.inc
-    
- 
+
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/clockapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \

diff --git a/packages/opie-clockapplet/opie-clockapplet_cvs.bb b/packages/opie-clockapplet/opie-clockapplet_cvs.bb
index cbe50f3..d8be3b0 100644 (file)
--- a/packages/opie-clockapplet/opie-clockapplet_cvs.bb
+++ b/packages/opie-clockapplet/opie-clockapplet_cvs.bb
@@ -1,6 +1,7 @@
 include ${PN}.inc
-    
+
 PV = "1.2.1+cvs-${CVSDATE}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/clockapplet \
            ${HANDHELDS_CVS};module=opie/pics \

diff --git a/packages/opie-irdaapplet/opie-irdaapplet.inc b/packages/opie-irdaapplet/opie-irdaapplet.inc
index 873515f..5662041 100644 (file)
--- a/packages/opie-irdaapplet/opie-irdaapplet.inc
+++ b/packages/opie-irdaapplet/opie-irdaapplet.inc
@@ -12,10 +12,10 @@ inherit opie
 
 pkg_postinst() {
 #!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
 if pidof -s qpe >/dev/null; then
   /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
 fi
- if [ -n "$D" ]; then false; fi
 }
 
 pkg_postrm() {

diff --git a/packages/opie-irdaapplet/opie-irdaapplet_1.2.1.bb b/packages/opie-irdaapplet/opie-irdaapplet_1.2.1.bb
index 10cacd8..0dda1a3 100644 (file)
--- a/packages/opie-irdaapplet/opie-irdaapplet_1.2.1.bb
+++ b/packages/opie-irdaapplet/opie-irdaapplet_1.2.1.bb
@@ -1,6 +1,6 @@
 include ${PN}.inc
-    
- 
+
+PR = "r1" 
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/irdaapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \

diff --git a/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb b/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb
index 3972be6..be47527 100644 (file)
--- a/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb
+++ b/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb
@@ -1,6 +1,7 @@
 include ${PN}.inc
-    
+
 PV = "1.2.1+cvs-${CVSDATE}"
+PR = "r1" 
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/irdaapplet \
            ${HANDHELDS_CVS};module=opie/pics \

diff --git a/packages/opie-lockapplet/opie-lockapplet.inc b/packages/opie-lockapplet/opie-lockapplet.inc
index 10bf61e..d54c854 100644 (file)
--- a/packages/opie-lockapplet/opie-lockapplet.inc
+++ b/packages/opie-lockapplet/opie-lockapplet.inc
@@ -14,10 +14,10 @@ inherit opie
 
 pkg_postinst() {
 #!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
 if pidof -s qpe >/dev/null; then
   /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
 fi
- if [ -n "$D" ]; then false; fi
 }
 
 pkg_postrm() {

diff --git a/packages/opie-lockapplet/opie-lockapplet_1.2.1.bb b/packages/opie-lockapplet/opie-lockapplet_1.2.1.bb
index 46163c7..add4ad4 100644 (file)
--- a/packages/opie-lockapplet/opie-lockapplet_1.2.1.bb
+++ b/packages/opie-lockapplet/opie-lockapplet_1.2.1.bb
@@ -1,6 +1,6 @@
 include ${PN}.inc
-    
- 
+
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/lockapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics "

diff --git a/packages/opie-lockapplet/opie-lockapplet_cvs.bb b/packages/opie-lockapplet/opie-lockapplet_cvs.bb
index b800a9b..29521fc 100644 (file)
--- a/packages/opie-lockapplet/opie-lockapplet_cvs.bb
+++ b/packages/opie-lockapplet/opie-lockapplet_cvs.bb
@@ -1,6 +1,7 @@
 include ${PN}.inc
-    
+
 PV = "1.2.1+cvs-${CVSDATE}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/lockapplet \
            ${HANDHELDS_CVS};module=opie/pics "

diff --git a/packages/opie-memoryapplet/opie-memoryapplet.inc b/packages/opie-memoryapplet/opie-memoryapplet.inc
index eb1e179..b673214 100644 (file)
--- a/packages/opie-memoryapplet/opie-memoryapplet.inc
+++ b/packages/opie-memoryapplet/opie-memoryapplet.inc
@@ -11,10 +11,10 @@ inherit opie
 
 pkg_postinst() {
 #!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
 if pidof -s qpe >/dev/null; then
   /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
 fi
- if [ -n "$D" ]; then false; fi
 }
 
 pkg_postrm() {

diff --git a/packages/opie-memoryapplet/opie-memoryapplet_1.2.1.bb b/packages/opie-memoryapplet/opie-memoryapplet_1.2.1.bb
index 4c33d73..0947c45 100644 (file)
--- a/packages/opie-memoryapplet/opie-memoryapplet_1.2.1.bb
+++ b/packages/opie-memoryapplet/opie-memoryapplet_1.2.1.bb
@@ -1,6 +1,6 @@
 include ${PN}.inc
-    
- 
+
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/memoryapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/sysinfo \

diff --git a/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb b/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb
index 93dc9ec..404b0b9 100644 (file)
--- a/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb
+++ b/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb
@@ -1,6 +1,7 @@
 include ${PN}.inc
-    
+
 PV = "1.2.1+cvs-${CVSDATE}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/memoryapplet \
            ${HANDHELDS_CVS};module=opie/noncore/settings/sysinfo \

diff --git a/packages/opie-multikeyapplet/opie-multikeyapplet.inc b/packages/opie-multikeyapplet/opie-multikeyapplet.inc
index 5b46c5f..5f32d65 100644 (file)
--- a/packages/opie-multikeyapplet/opie-multikeyapplet.inc
+++ b/packages/opie-multikeyapplet/opie-multikeyapplet.inc
@@ -12,10 +12,10 @@ inherit opie
 
 pkg_postinst() {
 #!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
 if pidof -s qpe >/dev/null; then
   /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
 fi
- if [ -n "$D" ]; then false; fi
 }
 
 pkg_postrm() {

diff --git a/packages/opie-multikeyapplet/opie-multikeyapplet_1.2.1.bb b/packages/opie-multikeyapplet/opie-multikeyapplet_1.2.1.bb
index 1f2acdd..ee8694a 100644 (file)
--- a/packages/opie-multikeyapplet/opie-multikeyapplet_1.2.1.bb
+++ b/packages/opie-multikeyapplet/opie-multikeyapplet_1.2.1.bb
@@ -1,6 +1,6 @@
 include ${PN}.inc
-    
- 
+
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/multikeyapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"

diff --git a/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb b/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb
index 209cbbf..d11b191 100644 (file)
--- a/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb
+++ b/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb
@@ -1,6 +1,7 @@
 include ${PN}.inc
-    
+
 PV = "1.2.1+cvs-${CVSDATE}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/multikeyapplet \
            ${HANDHELDS_CVS};module=opie/apps"

diff --git a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet.inc b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet.inc
index b3655c5..706fe4d 100644 (file)
--- a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet.inc
+++ b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet.inc
@@ -9,10 +9,10 @@ inherit opie
 
 pkg_postinst() {
 #!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
 if pidof -s qpe >/dev/null; then
   /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
 fi
- if [ -n "$D" ]; then false; fi
 }
 
 pkg_postrm() {

diff --git a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.1.bb b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.1.bb
index 0a3851c..3e3dc6d 100644 (file)
--- a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.1.bb
+++ b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.1.bb
@@ -1,6 +1,6 @@
 include ${PN}.inc
-    
- 
+
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/pyquicklaunch \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \

diff --git a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.bb b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.bb
index f504159..db20019 100644 (file)
--- a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.bb
+++ b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.bb
@@ -1,6 +1,7 @@
 include ${PN}.inc
-    
+
 PV = "1.2.1+cvs-${CVSDATE}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/pyquicklaunch \
            ${HANDHELDS_CVS};module=opie/pics \

diff --git a/packages/opie-screenshotapplet/opie-screenshotapplet.inc b/packages/opie-screenshotapplet/opie-screenshotapplet.inc
index 951e81b..1ff889a 100644 (file)
--- a/packages/opie-screenshotapplet/opie-screenshotapplet.inc
+++ b/packages/opie-screenshotapplet/opie-screenshotapplet.inc
@@ -13,16 +13,16 @@ inherit opie
 
 pkg_postinst() {
 #!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
 if pidof -s qpe >/dev/null; then
   /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
 fi
- if [ -n "$D" ]; then false; fi
 }
 
 pkg_postrm() {
 #!/bin/sh
+if [ -n "$D" ]; then false; fi
 /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
- if [ -n "$D" ]; then false; fi
 }
 
 # FILES plugins/applets/libscreenshotapplet.so*

diff --git a/packages/opie-screenshotapplet/opie-screenshotapplet_1.2.1.bb b/packages/opie-screenshotapplet/opie-screenshotapplet_1.2.1.bb
index da266ce..ccc414e 100644 (file)
--- a/packages/opie-screenshotapplet/opie-screenshotapplet_1.2.1.bb
+++ b/packages/opie-screenshotapplet/opie-screenshotapplet_1.2.1.bb
@@ -1,6 +1,6 @@
 include ${PN}.inc
-    
- 
+
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/screenshotapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps                          \

diff --git a/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb b/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb
index 136739d..54f6416 100644 (file)
--- a/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb
+++ b/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb
@@ -1,6 +1,7 @@
 include ${PN}.inc
-    
+
 PV = "1.2.1+cvs-${CVSDATE}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/screenshotapplet \
            ${HANDHELDS_CVS};module=opie/apps                          \

diff --git a/packages/opie-volumeapplet/opie-volumeapplet.inc b/packages/opie-volumeapplet/opie-volumeapplet.inc
index 648effe..c253857 100644 (file)
--- a/packages/opie-volumeapplet/opie-volumeapplet.inc
+++ b/packages/opie-volumeapplet/opie-volumeapplet.inc
@@ -12,10 +12,10 @@ inherit opie
 
 pkg_postinst() {
 #!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
 if pidof -s qpe >/dev/null; then
   /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
 fi
- if [ -n "$D" ]; then false; fi
 }
 
 pkg_postrm() {

diff --git a/packages/opie-volumeapplet/opie-volumeapplet_1.2.1.bb b/packages/opie-volumeapplet/opie-volumeapplet_1.2.1.bb
index 96cf720..38cf693 100644 (file)
--- a/packages/opie-volumeapplet/opie-volumeapplet_1.2.1.bb
+++ b/packages/opie-volumeapplet/opie-volumeapplet_1.2.1.bb
@@ -1,6 +1,6 @@
 include ${PN}.inc
-    
- 
+
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/volumeapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"

diff --git a/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb b/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb
index be79bbd..259291d 100644 (file)
--- a/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb
+++ b/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb
@@ -1,6 +1,7 @@
 include ${PN}.inc
-    
+
 PV = "1.2.1+cvs-${CVSDATE}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/volumeapplet \
            ${HANDHELDS_CVS};module=opie/apps"