diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2004-11-28 12:20:18 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2004-11-28 12:20:18 +0000 |
| commit | 7f3ba086ff54c067c83e7672feed7523d04837a3 (patch) | |
| tree | be04166fe05548b521197d0b8d1f9e5c690a805d /opie-networksettings | |
| parent | 337406cc077a53127903f9b6ff763856a663c7f2 (diff) | |
Merge bk://oe-devel@oe-devel.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2004/11/28 03:29:12+01:00 uni-frankfurt.de!mickeyl
make zbedic 0.9.2-cvs compile
2004/11/28 02:35:32+01:00 uni-frankfurt.de!mickeyl
wellenreiter: ensure the kernel's wireless.h gets picked up
2004/11/28 02:08:52+01:00 uni-frankfurt.de!mickeyl
networkapplet: ensure the kernel's wireless.h gets picked up
2004/11/28 02:08:28+01:00 uni-frankfurt.de!mickeyl
wirelessapplet: ensure the kernel's wireless.h gets picked up
2004/11/28 01:13:16+01:00 uni-frankfurt.de!mickeyl
ship libopiobex0 in opie-image
2004/11/28 00:02:56+01:00 uni-frankfurt.de!mickeyl
make opie-networksettings pick up the kernel's wireless.h
2004/11/27 23:51:12+01:00 uni-frankfurt.de!mickeyl
make libopie pick up the kernel's wireless.h
2004/11/27 18:53:59+01:00 uni-frankfurt.de!mickeyl
make wireless-tools pick up the kernel's wireless.h
BKrev: 41a9c282CzUBHaxVZPfCILOfAoitvw
Diffstat (limited to 'opie-networksettings')
| -rw-r--r-- | opie-networksettings/opie-networksettings_1.1.7.oe | 5 | ||||
| -rw-r--r-- | opie-networksettings/opie-networksettings_cvs.oe | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/opie-networksettings/opie-networksettings_1.1.7.oe b/opie-networksettings/opie-networksettings_1.1.7.oe index bd491aa98c..779cd9c7c1 100644 --- a/opie-networksettings/opie-networksettings_1.1.7.oe +++ b/opie-networksettings/opie-networksettings_1.1.7.oe @@ -5,17 +5,20 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL" PROVIDES = "opie-networksettings-pppplugin opie-networksettings-wlanplugin" APPNAME = "networksettings" +PR = "r1" TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/networksettings \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ ${HANDHELDS_CVS};tag=${TAG};module=opie/root" - 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 0a0ac15f9c..4c0c8f6370 100644 --- a/opie-networksettings/opie-networksettings_cvs.oe +++ b/opie-networksettings/opie-networksettings_cvs.oe @@ -5,18 +5,20 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL" PROVIDES = "opie-networksettings-pppplugin opie-networksettings-wlanplugin" PV = "1.1.7+cvs-${CVSDATE}" - +PR = "r1" APPNAME = "networksettings" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/networksettings \ ${HANDHELDS_CVS};module=opie/pics \ ${HANDHELDS_CVS};module=opie/apps \ ${HANDHELDS_CVS};module=opie/root" - 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() { |