revert using the kernel's wireless.h since all kernels are now on WE16

BKrev: 41aba19eke9AlVn0cIYk3zbvPUuY_A

10 files changed, 6 insertions, 42 deletions

diff --git a/libopie/libopie2_1.1.7.oe b/libopie/libopie2_1.1.7.oe
index f49dc6f086..57d7e119c0 100644
--- a/libopie/libopie2_1.1.7.oe
+++ b/libopie/libopie2_1.1.7.oe
@@ -6,7 +6,7 @@ LICENSE = "LGPL"
 I18N_FILES = "libopiecore2.ts libopiesecurity2.ts"
 DEPENDS = "libqpe-opie sqlite3 libpcap-0.7.2 virtual/kernel"
 PROVIDES = "libopiecore2 libopiedb2 libopiemm2 libopiesecurity2 libopienet2 libopiepim2 libopieui2 "
-PR = "r1"
+PR = "r2"
 
 TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \
@@ -15,9 +15,6 @@ S = "${WORKDIR}/libopie2"
 
 inherit opie
 
-# we need to pick up the kernel's wireless.h or else the WE will be broken
-export OE_QMAKE_CFLAGS="-I${STAGING_KERNEL_DIR}/include ${CFLAGS}"
-
 #FIXME: Add machine specific bits here. Best use oe_machinstall and read from a given file
 
 EXTRA_QMAKEVARS_POST = 'DEFINES+=OPIE_NEW_MALLOC \
diff --git a/libopie/libopie2_cvs.oe b/libopie/libopie2_cvs.oe
index 48cd7040c6..4862fc9e31 100644
--- a/libopie/libopie2_cvs.oe
+++ b/libopie/libopie2_cvs.oe
@@ -5,7 +5,7 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "LGPL"
 I18N_FILES = "libopiecore2.ts libopiesecurity2.ts"
 DEPENDS = "libqpe-opie sqlite3 libpcap-0.7.2 virtual/kernel"
-PR = "r5"
+PR = "r6"
 PROVIDES = "libopiecore2 libopiedb2 libopiemm2 libopiesecurity2 libopienet2 libopiepim2 libopieui2"
 PV = "1.1.7+cvs-${CVSDATE}"
 
@@ -15,9 +15,6 @@ S = "${WORKDIR}/libopie2"
 
 inherit opie
 
-# we need to pick up the kernel's wireless.h or else the WE will be broken
-export OE_QMAKE_CFLAGS="-I${STAGING_KERNEL_DIR}/include ${CFLAGS}"
-
 #FIXME: Add machine specific bits here. Best use oe_machinstall and read from a given file
 
 EXTRA_QMAKEVARS_POST = 'DEFINES+=OPIE_NEW_MALLOC \
diff --git a/opie-networkapplet/opie-networkapplet_1.1.7.oe b/opie-networkapplet/opie-networkapplet_1.1.7.oe
index d654acd2d5..7bcbf26a7e 100644
--- a/opie-networkapplet/opie-networkapplet_1.1.7.oe
+++ b/opie-networkapplet/opie-networkapplet_1.1.7.oe
@@ -4,7 +4,6 @@ PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 RDEPENDS = "opie-networksettings"
-PR = "r1"
 APPNAME = "networkapplet"
 
 TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
@@ -14,9 +13,6 @@ S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
 
-# we need to pick up the kernel's wireless.h or else the WE will be broken
-export OE_QMAKE_CFLAGS="-I${STAGING_KERNEL_DIR}/include ${CFLAGS}"
-
 pkg_postinst() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi
diff --git a/opie-networkapplet/opie-networkapplet_cvs.oe b/opie-networkapplet/opie-networkapplet_cvs.oe
index af189d2129..3aead19a3b 100644
--- a/opie-networkapplet/opie-networkapplet_cvs.oe
+++ b/opie-networkapplet/opie-networkapplet_cvs.oe
@@ -13,9 +13,6 @@ S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
 
-# we need to pick up the kernel's wireless.h or else the WE will be broken
-export OE_QMAKE_CFLAGS="-I${STAGING_KERNEL_DIR}/include ${CFLAGS}"
-
 pkg_postinst() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi
diff --git a/opie-networksettings/opie-networksettings_1.1.7.oe b/opie-networksettings/opie-networksettings_1.1.7.oe
index 779cd9c7c1..404d2f11bd 100644
--- a/opie-networksettings/opie-networksettings_1.1.7.oe
+++ b/opie-networksettings/opie-networksettings_1.1.7.oe
@@ -5,7 +5,7 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 PROVIDES = "opie-networksettings-pppplugin opie-networksettings-wlanplugin"
 APPNAME = "networksettings"
-PR = "r1"
+PR = "r0"
 
 TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/networksettings \
@@ -16,9 +16,6 @@ S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
 
-# we need to pick up the kernel's wireless.h or else the WE will be broken
-export OE_QMAKE_CFLAGS="-I${STAGING_KERNEL_DIR}/include ${CFLAGS}"
-
 EXTRA_QMAKEVARS_POST += "LIBS+=-L${S}"
 
 do_install() {
diff --git a/opie-networksettings/opie-networksettings_cvs.oe b/opie-networksettings/opie-networksettings_cvs.oe
index 4c0c8f6370..7a2d61d730 100644
--- a/opie-networksettings/opie-networksettings_cvs.oe
+++ b/opie-networksettings/opie-networksettings_cvs.oe
@@ -5,7 +5,7 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 PROVIDES = "opie-networksettings-pppplugin opie-networksettings-wlanplugin"
 PV = "1.1.7+cvs-${CVSDATE}"
-PR = "r1"
+PR = "r0"
 APPNAME = "networksettings"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/networksettings \
@@ -16,9 +16,6 @@ S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
 
-# we need to pick up the kernel's wireless.h or else the WE will be broken
-export OE_QMAKE_CFLAGS="-I${STAGING_KERNEL_DIR}/include ${CFLAGS}"
-
 EXTRA_QMAKEVARS_POST += "LIBS+=-L${S}"
 
 do_install() {
diff --git a/opie-wellenreiter/opie-wellenreiter_1.0.3.oe b/opie-wellenreiter/opie-wellenreiter_1.0.3.oe
index 835b928084..a0d84b60a0 100644
--- a/opie-wellenreiter/opie-wellenreiter_1.0.3.oe
+++ b/opie-wellenreiter/opie-wellenreiter_1.0.3.oe
@@ -4,12 +4,9 @@ PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 RRECOMMENDS = "manufacturers"
-PR = "r4"
-
 APPNAME = "wellenreiter"
 APPTYPE = "binary"
-
-CVSDATE = "20041015"
+PR = "r5"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/wellenreiter;date=20040504 \
            ${HANDHELDS_CVS};module=opie/pics;date=20040504                     \
@@ -18,9 +15,6 @@ S = "${WORKDIR}/wellenreiter"
 
 inherit opie
 
-# we need to pick up the kernel's wireless.h or else the WE will be broken
-export OE_QMAKE_CFLAGS="-I${STAGING_KERNEL_DIR}/include ${CFLAGS}"
-
 do_install() {
         install -d ${D}/${palmtopdir}/pics/${APPNAME}/
 	install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.* ${D}${palmtopdir}/pics/${APPNAME}/
diff --git a/opie-wellenreiter/opie-wellenreiter_cvs.oe b/opie-wellenreiter/opie-wellenreiter_cvs.oe
index 299ce459ff..fd2eec116a 100644
--- a/opie-wellenreiter/opie-wellenreiter_cvs.oe
+++ b/opie-wellenreiter/opie-wellenreiter_cvs.oe
@@ -5,7 +5,7 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 RRECOMMENDS = "manufacturers"
 PV = "1.0.3+cvs-${CVSDATE}"
-PR = "r1"
+PR = "r2"
 APPNAME = "wellenreiter"
 APPTYPE = "binary"
 
@@ -16,9 +16,6 @@ S = "${WORKDIR}/wellenreiter"
 
 inherit opie
 
-# we need to pick up the kernel's wireless.h or else the WE will be broken
-export OE_QMAKE_CFLAGS="-I${STAGING_KERNEL_DIR}/include ${CFLAGS}"
-
 do_install() {
         install -d ${D}/${palmtopdir}/pics/${APPNAME}/
 	install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.* ${D}${palmtopdir}/pics/${APPNAME}/
diff --git a/opie-wirelessapplet/opie-wirelessapplet_1.1.7.oe b/opie-wirelessapplet/opie-wirelessapplet_1.1.7.oe
index b49f9ecdab..87d8612ac2 100644
--- a/opie-wirelessapplet/opie-wirelessapplet_1.1.7.oe
+++ b/opie-wirelessapplet/opie-wirelessapplet_1.1.7.oe
@@ -3,7 +3,6 @@ SECTION = "opie/applets"
 PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
-PR = "r1"
 APPNAME = "wirelessapplet"
 
 TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
@@ -12,9 +11,6 @@ S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
 
-# we need to pick up the kernel's wireless.h or else the WE will be broken
-export OE_QMAKE_CFLAGS="-I${STAGING_KERNEL_DIR}/include ${CFLAGS}"
-
 pkg_postinst() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi
diff --git a/opie-wirelessapplet/opie-wirelessapplet_cvs.oe b/opie-wirelessapplet/opie-wirelessapplet_cvs.oe
index 7e05031b02..a586cfef5a 100644
--- a/opie-wirelessapplet/opie-wirelessapplet_cvs.oe
+++ b/opie-wirelessapplet/opie-wirelessapplet_cvs.oe
@@ -5,16 +5,12 @@ MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "wirelessapplet"
-PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/wirelessapplet"
 S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
 
-# we need to pick up the kernel's wireless.h or else the WE will be broken
-export OE_QMAKE_CFLAGS="-I${STAGING_KERNEL_DIR}/include ${CFLAGS}"
-
 pkg_postinst() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi