Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/30 19:02:32+01:00 handhelds.org!CoreDump
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into handhelds.org:/home/mhentges/OpenEmbedded/bitbake/openembedded

2004/12/30 19:02:17+01:00 handhelds.org!CoreDump
opie-wirelessapplet: Remove from world and meta-opie as it is the No.1 reason for resume problems

2004/12/30 17:39:26+00:00 nexus.co.uk!pb
update gpe-appmgr to 2.5

BKrev: 41d44b88rVuRhcBP1NWQbdcDlOjVBw

diff --git a/packages/gpe-appmgr/gpe-appmgr_2.5.bb b/packages/gpe-appmgr/gpe-appmgr_2.5.bb
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/meta/meta-opie.bb b/packages/meta/meta-opie.bb
index 0cd5476..5dae95e 100644 (file)
--- a/packages/meta/meta-opie.bb
+++ b/packages/meta/meta-opie.bb
@@ -59,7 +59,6 @@ opie-suspendapplet \
 opie-vmemo \
 opie-volumeapplet \
 opie-vtapplet \
-opie-wirelessapplet \
 opie-zkbapplet \ 
 "
 RDEPENDS_task-opie-applets = "${task-opie-applets}"
@@ -367,8 +366,7 @@ RDEPENDS_task-opie-bluetooth = "${task-opie-bluetooth}"
 DEPENDS += " ${task-opie-bluetooth}"
 
 task-opie-wlan = "\
-opie-wellenreiter \
-opie-wirelessapplet "
+opie-wellenreiter "
 RDEPENDS_task-opie-wlan = "${task-opie-wlan}"
 DEPENDS += " ${task-opie-wlan}"
 

diff --git a/packages/opie-wirelessapplet/opie-wirelessapplet_1.1.8.bb b/packages/opie-wirelessapplet/opie-wirelessapplet_1.1.8.bb
index e69de29..353bba3 100644 (file)
--- a/packages/opie-wirelessapplet/opie-wirelessapplet_1.1.8.bb
+++ b/packages/opie-wirelessapplet/opie-wirelessapplet_1.1.8.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "Wireless Applet"
+SECTION = "opie/applets"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+APPNAME = "wirelessapplet"
+
+EXCLUDE_FROM_WORLD = "1"
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/wirelessapplet"
+S = "${WORKDIR}/${APPNAME}"
+
+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
+}
+
+pkg_postrm() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+}
+

diff --git a/packages/opie-wirelessapplet/opie-wirelessapplet_cvs.bb b/packages/opie-wirelessapplet/opie-wirelessapplet_cvs.bb
index 9cee470..53eddec 100644 (file)
--- a/packages/opie-wirelessapplet/opie-wirelessapplet_cvs.bb
+++ b/packages/opie-wirelessapplet/opie-wirelessapplet_cvs.bb
@@ -6,6 +6,8 @@ LICENSE = "GPL"
 PV = "1.1.8+cvs-${CVSDATE}"
 APPNAME = "wirelessapplet"
 
+EXCLUDE_FROM_WORLD = "1"
+
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/wirelessapplet"
 S = "${WORKDIR}/${APPNAME}"