diff options
| author |   Martin Dietze <di@fh-wedel.de> | 2006-09-08 13:09:43 +0000 |
|---|---|---|
| committer | Martin Dietze <di@fh-wedel.de> | 2006-09-08 13:09:43 +0000 |
| commit | 6f53e1d4b2c7aed88b3bf4c43ed3baa609654e5e (patch) | |
| tree | d0fae1b3ecebe91a9e9ae6a74aae3395e6cc57d8 /packages/madwifi | |
| parent | 005ccbff6b2c8c9e36abb1802166befd8cc256e5 (diff) | |
| download | openembedded-6f53e1d4b2c7aed88b3bf4c43ed3baa609654e5e.tar.gz | |
hostap-daemon and madwifi: fix compatibility problems on mtx platforms
* added mtx-2 configuration to hostapd-daemon
* made madwifi-modules_cvs the default choice (the bsd branch has been abandoned)
* made sure that madwifi_modules stages the headers correctly so that hostap-daemon compiles on mtx/nylon
Diffstat (limited to 'packages/madwifi')
| -rw-r--r-- | packages/madwifi/madwifi-modules_cvs-bsd.bb | 4 | ||||
| -rw-r--r-- | packages/madwifi/madwifi-modules_cvs.bb | 20 |
2 files changed, 19 insertions, 5 deletions
diff --git a/packages/madwifi/madwifi-modules_cvs-bsd.bb b/packages/madwifi/madwifi-modules_cvs-bsd.bb index 6da2c34baf..be6de0663f 100644 --- a/packages/madwifi/madwifi-modules_cvs-bsd.bb +++ b/packages/madwifi/madwifi-modules_cvs-bsd.bb @@ -5,7 +5,8 @@ MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" LICENSE = "GPL" RDEPENDS = "kernel (${KERNEL_VERSION})" DEPENDS = "virtual/kernel" -PV = "1:0.0+cvs${SRCDATE}-bsd" +PV = "1.0.0+cvs${SRCDATE}-bsd" +DEFAULT_PREFERENCE = "-1" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/madwifi;module=madwifi;tag=BSD;date=${SRCDATE}" @@ -16,6 +17,7 @@ inherit module-base # Hack Alert :D ARCH_mipsel = "mips" EXTRA_OEMAKE_mtx-1 = "TARGET=mips-le-elf KERNELPATH=${STAGING_KERNEL_DIR} KERNELRELEASE=${KERNEL_VERSION} TOOLPREFIX=${TARGET_PREFIX} \ +EXTRA_OEMAKE_mtx-2 = "TARGET=mips-le-elf KERNELPATH=${STAGING_KERNEL_DIR} KERNELRELEASE=${KERNEL_VERSION} TOOLPREFIX=${TARGET_PREFIX} \ COPTS='-G 0 -mno-abicalls -fno-pic -Wa,--trap -fno-strict-aliasing -fno-common -fomit-frame-pointer -mlong-calls -DATH_PCI'" do_compile() { diff --git a/packages/madwifi/madwifi-modules_cvs.bb b/packages/madwifi/madwifi-modules_cvs.bb index 0bef3d506e..bc89d84a15 100644 --- a/packages/madwifi/madwifi-modules_cvs.bb +++ b/packages/madwifi/madwifi-modules_cvs.bb @@ -5,9 +5,10 @@ MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" LICENSE = "GPL" RDEPENDS = "kernel (${KERNEL_VERSION})" DEPENDS = "virtual/kernel" -PV = "1:0.0+cvs${SRCDATE}" +SRCDATE = "20050803" +PV = "1.0.0+cvs${SRCDATE}" -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/madwifi;module=madwifi" +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/madwifi;module=madwifi;date=${SRCDATE}" S = "${WORKDIR}/madwifi" @@ -17,6 +18,8 @@ inherit module-base ARCH_mipsel = "mips" EXTRA_OEMAKE_mtx-1 = "TARGET=mips-le-elf KERNELPATH=${STAGING_KERNEL_DIR} KERNELRELEASE=${KERNEL_VERSION} TOOLPREFIX=${TARGET_PREFIX} \ COPTS='-G 0 -mno-abicalls -fno-pic -Wa,--trap -fno-strict-aliasing -fno-common -fomit-frame-pointer -mlong-calls -DATH_PCI'" +EXTRA_OEMAKE_mtx-2 = "TARGET=mips-le-elf KERNELPATH=${STAGING_KERNEL_DIR} KERNELRELEASE=${KERNEL_VERSION} TOOLPREFIX=${TARGET_PREFIX} \ +COPTS='-G 0 -mno-abicalls -fno-pic -Wa,--trap -fno-strict-aliasing -fno-common -fomit-frame-pointer -mlong-calls -DATH_PCI'" do_compile() { oe_runmake @@ -25,10 +28,19 @@ do_compile() { do_install() { oe_runmake DESTDIR=${D} install - install -d ${D}${sbindir} + install -d ${D}/${sbindir} cd tools; oe_runmake DESTDIR=${D} BINDIR=${sbindir} install - install -m 755 athchans athctrl athkey ${D}${sbindir} + install -m 755 athchans athctrl athkey ${D}/${sbindir} +} + +do_stage() { + # hostapd and wpa_supplicant need these files + install -d ${STAGING_INCDIR}/madwifi/net80211/ ${STAGING_INCDIR}/madwifi/include + install -m 0644 net80211/*.h ${STAGING_INCDIR}/madwifi/net80211/ + install -m 0644 include/compat.h ${STAGING_INCDIR}/madwifi/include/ + cd ${STAGING_INCDIR}/madwifi/net80211/ + ln -s ../include/compat.h . } pkg_postinst() { |