From 6df171ed659aa21947821f2a5b8c5af96b69e8d6 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Tue, 7 Jun 2005 18:12:58 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into marsco.kalmiopsis:/home/nslu2/openembedded 2005/06/07 16:00:28+02:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/06/07 16:00:10+02:00 uni-frankfurt.de!mickeyl wireless tools: package libiw (again) 2005/06/07 15:49:41+02:00 utwente.nl!koen documentation.conf: typo-- 2005/06/07 14:00:41+02:00 utwente.nl!koen Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into bitbake.utwente.nl:/home/koen/OE/openembedded 2005/06/07 14:00:25+02:00 utwente.nl!koen gkdial_1.8.1.bb: point SRC_URI to the hh.org sourcemirror. ~lart disappearing sources 2005/06/07 13:49:20+02:00 hrw.one.pl!hrw Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/ into home.hrw.one.pl:/home/hrw/zaurus/oe/openembedded 2005/06/07 13:48:31+02:00 hrw.one.pl!hrw flex: unbreak non-native build, mark BROKEN on arm 2005/06/07 11:50:45+02:00 mn-solutions.de!schurig wpa-supplicant_cvs.bb: fix path for the defaults 2005/06/07 10:24:03+02:00 mn-solutions.de!schurig Fixes the "TypeError: cannot concatenate 'str' and 'NoneType' objects" we got for packages like atd, dbus etc in update-rc.d.bbclass. Thanks do13 BKrev: 42a5e3aaLki5_YPl8KJqM8Qwgk5q4w --- packages/flex/flex-native_2.5.31.bb | 9 ++++- packages/flex/flex.inc | 8 +---- packages/flex/flex_2.5.31.bb | 9 ++++- packages/gkdial/gkdial_1.8.1.bb | 2 +- packages/wireless-tools/wireless-tools_28-pre6.bb | 43 +++++++++++++++++++++++ packages/wpa-supplicant/wpa-supplicant_cvs.bb | 6 ++-- 6 files changed, 64 insertions(+), 13 deletions(-) (limited to 'packages') diff --git a/packages/flex/flex-native_2.5.31.bb b/packages/flex/flex-native_2.5.31.bb index 28dcda51d2..fa125d6be7 100644 --- a/packages/flex/flex-native_2.5.31.bb +++ b/packages/flex/flex-native_2.5.31.bb @@ -1,4 +1,11 @@ include flex.inc inherit native -PR = "r0" +PR = "r1" + +do_stage () { + install -m 0755 flex ${STAGING_BINDIR} + oe_libinstall -a libfl ${STAGING_LIBDIR} + ln -sf ./flex ${STAGING_BINDIR}/flex++ + ln -sf ./flex ${STAGING_BINDIR}/lex +} diff --git a/packages/flex/flex.inc b/packages/flex/flex.inc index 41beef3245..8f84eb1996 100644 --- a/packages/flex/flex.inc +++ b/packages/flex/flex.inc @@ -5,11 +5,5 @@ LICENSE = "BSD" SRC_URI = "http://mesh.dl.sf.net/lex/flex-2.5.31.tar.bz2" S = "${WORKDIR}/flex-${PV}" -inherit native autotools +inherit autotools -do_stage () { - install -m 0755 flex ${STAGING_BINDIR} - oe_libinstall -a libfl ${STAGING_LIBDIR} - ln -sf ./flex ${STAGING_BINDIR}/flex++ - ln -sf ./flex ${STAGING_BINDIR}/lex -} diff --git a/packages/flex/flex_2.5.31.bb b/packages/flex/flex_2.5.31.bb index b7c316fb1b..8349355b89 100644 --- a/packages/flex/flex_2.5.31.bb +++ b/packages/flex/flex_2.5.31.bb @@ -1,2 +1,9 @@ +BROKEN_arm="1" + +# On ARM I got: +# +# tables.c: In function `yytbl_write16': +# tables.c:313: internal compiler error: in arm_print_operand, at config/arm/arm.c:11410 + include flex.inc -PR = "r0" +PR = "r1" diff --git a/packages/gkdial/gkdial_1.8.1.bb b/packages/gkdial/gkdial_1.8.1.bb index 15ca1612e8..ac37080d11 100644 --- a/packages/gkdial/gkdial_1.8.1.bb +++ b/packages/gkdial/gkdial_1.8.1.bb @@ -9,7 +9,7 @@ PRIORITY = "optional" PR = "r2gpe1" -SRC_URI = "http://gkdial.sourceforge.net/downloads/${PN}-${PV}.tar.gz \ +SRC_URI = "http://familiar.handhelds.org/source/v0.8.2/${PN}-${PV}.tar.gz \ file://gkdial-pgpe.patch;patch=1 \ file://gkdial-ungnome.patch;patch=1;pnum=0 \ file://gkdial-gladedir.patch;patch=1;pnum=0 \ diff --git a/packages/wireless-tools/wireless-tools_28-pre6.bb b/packages/wireless-tools/wireless-tools_28-pre6.bb index e69de29bb2..f230cd307b 100644 --- a/packages/wireless-tools/wireless-tools_28-pre6.bb +++ b/packages/wireless-tools/wireless-tools_28-pre6.bb @@ -0,0 +1,43 @@ +DESCRIPTION = "Tools for the Linux Standard Wireless Extension Subsystem" +HOMEPAGE = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html" +SECTION = "base" +PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer " +LICENSE = "GPL" +PR = "r1" + +SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.28.pre6.tar.gz \ + file://man.patch;patch=1 \ + file://fixheaders.patch;patch=1 \ + file://wireless-tools.if-pre-up" +S = "${WORKDIR}/wireless_tools.28" + +CFLAGS =+ "-I${S}" +EXTRA_OEMAKE = "-e 'BUILD_SHARED=y' \ + 'INSTALL_DIR=${D}${base_sbindir}' \ + 'INSTALL_LIB=${D}${libdir}' \ + 'INSTALL_INC=${D}${includedir}' \ + 'INSTALL_MAN=${D}${mandir}'" + +do_compile() { + oe_runmake all libiw.a +} + +do_stage () { + install -m 0644 wireless.h ${STAGING_INCDIR}/ + install -m 0644 iwlib.h ${STAGING_INCDIR}/ + oe_libinstall -a -so libiw ${STAGING_LIBDIR}/ +} + +do_install() { + oe_runmake PREFIX=${D} install-iwmulticall install-dynamic + install -d ${D}${sysconfdir}/network/if-pre-up.d + install ${WORKDIR}/wireless-tools.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/wireless-tools +} + +PACKAGES = "libiw libiw-dev libiw-doc ${PN} ${PN}-doc" +FILES_libiw = "${libdir}/*.so.*" +FILES_libiw-dev = "${libdir}/*.a ${libdir}/*.so ${includedir}" +FILES_libiw-doc = "${mandir}/man7" +FILES_${PN} = "${bindir} ${sbindir} ${base_sbindir} ${base_bindir} ${sysconfdir}/network" +FILES_${PN}-doc = "${mandir}/man8" diff --git a/packages/wpa-supplicant/wpa-supplicant_cvs.bb b/packages/wpa-supplicant/wpa-supplicant_cvs.bb index 6696df6d0c..c558d4e834 100644 --- a/packages/wpa-supplicant/wpa-supplicant_cvs.bb +++ b/packages/wpa-supplicant/wpa-supplicant_cvs.bb @@ -5,7 +5,7 @@ MAINTAINER = "Holger Schurig" HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" DEPENDS = "openssl" PV = "0.0cvs${CVSDATE}" -PR = "r1" +PR = "r2" SRC_URI = "cvs://anonymous@hostap.epitest.fi/cvs;module=hostap \ file://use-channel.patch;patch=1 \ @@ -54,6 +54,6 @@ do_install () { install -d ${D}${sysconfdir}/init.d install -m700 ${WORKDIR}/init.sh ${D}${sysconfdir}/init.d/wpa - install -d ${D}${sysconfdir}/defaults - install -m600 ${WORKDIR}/defaults ${D}${sysconfdir}/defaults/wpa + install -d ${D}${sysconfdir}/default + install -m600 ${WORKDIR}/defaults ${D}${sysconfdir}/default/wpa } -- cgit v1.2.3