[oe-commits] org.oe.dev hostap-daemon and madwifi: fix compatibility problems on mtx platforms
MartinDietze commit
openembedded-commits at lists.openembedded.org
Fri Sep 8 13:22:56 UTC 2006
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
Author: MartinDietze at openembedded.org
Branch: org.openembedded.dev
Revision: aecc05c76d647b54e6f0b608dfdc9dbc5501c62e
ViewMTN: http://monotone.openembedded.org/revision.psp?id=aecc05c76d647b54e6f0b608dfdc9dbc5501c62e
Files:
1
packages/hostap/hostap-daemon/mtx-2
packages/hostap/hostap-daemon/mtx-2/defconfig
packages/hostap/hostap-daemon.inc
packages/hostap/hostap-modules.inc
packages/madwifi/madwifi-modules_cvs-bsd.bb
packages/madwifi/madwifi-modules_cvs.bb
Diffs:
#
# mt diff -r78d9c264eac3b95c8499edb9bae8e11b6d75aa33 -raecc05c76d647b54e6f0b608dfdc9dbc5501c62e
#
#
#
# add_dir "packages/hostap/hostap-daemon/mtx-2"
#
# add_file "packages/hostap/hostap-daemon/mtx-2/defconfig"
# content [18009f1533b0796bdbd95621153652dc811ecb9c]
#
# patch "packages/hostap/hostap-daemon.inc"
# from [eb25208dbdd6e1e4c06acacfaa125638545e1403]
# to [5b468b01b285f0515e7e6f11f25cfc38131c14d0]
#
# patch "packages/hostap/hostap-modules.inc"
# from [df1207da14ba41eb7d3096f393c46cc404dd8ae8]
# to [25d727553b518e4c8a47a88c9a87f5bbc0ce3e5d]
#
# patch "packages/madwifi/madwifi-modules_cvs-bsd.bb"
# from [0869ae08141145db97b2e54fda194501b38459b7]
# to [929c4a31cb6f669d93685a22d436866c89b01aea]
#
# patch "packages/madwifi/madwifi-modules_cvs.bb"
# from [253becedd7bcaaca39b1d3f6f1afcef585ea8191]
# to [aa7fff022dd9a02d4c8635b765740063acd5cc4d]
#
============================================================
--- packages/hostap/hostap-daemon/mtx-2/defconfig 18009f1533b0796bdbd95621153652dc811ecb9c
+++ packages/hostap/hostap-daemon/mtx-2/defconfig 18009f1533b0796bdbd95621153652dc811ecb9c
@@ -0,0 +1,66 @@
+# Example hostapd build time configuration
+#
+# This file lists the configuration options that are used when building the
+# hostapd binary. All lines starting with # are ignored. Configuration option
+# lines must be commented out complete, if they are not to be included, i.e.,
+# just setting VARIABLE=n is not disabling that variable.
+#
+# This file is included in Makefile, so variables like CFLAGS and LIBS can also
+# be modified from here. In most cass, these lines should use += in order not
+# to override previous values of the variables.
+
+# Driver interface for Host AP driver
+CONFIG_DRIVER_HOSTAP=y
+
+# Driver interface for wired authenticator
+CONFIG_DRIVER_WIRED=y
+
+# Driver interface for madwifi driver
+CONFIG_DRIVER_MADWIFI=y
+#CFLAGS += -I../head # change to reflect local setup; directory for madwifi src
+
+# Driver interface for Prism54 driver
+CONFIG_DRIVER_PRISM54=y
+
+# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
+#CONFIG_DRIVER_BSD=y
+#CFLAGS += -I/usr/local/include
+#LIBS += -L/usr/local/lib
+
+# IEEE 802.11F/IAPP
+CONFIG_IAPP=y
+
+# WPA2/IEEE 802.11i RSN pre-authentication
+CONFIG_RSN_PREAUTH=y
+
+# Integrated EAP authenticator
+CONFIG_EAP=y
+
+# EAP-MD5 for the integrated EAP authenticator
+CONFIG_EAP_MD5=y
+
+# EAP-TLS for the integrated EAP authenticator
+CONFIG_EAP_TLS=y
+
+# EAP-MSCHAPv2 for the integrated EAP authenticator
+CONFIG_EAP_MSCHAPV2=y
+
+# EAP-PEAP for the integrated EAP authenticator
+CONFIG_EAP_PEAP=y
+
+# EAP-GTC for the integrated EAP authenticator
+CONFIG_EAP_GTC=y
+
+# EAP-TTLS for the integrated EAP authenticator
+CONFIG_EAP_TTLS=y
+
+# EAP-SIM for the integrated EAP authenticator
+#CONFIG_EAP_SIM=y
+
+# PKCS#12 (PFX) support (used to read private key and certificate file from
+# a file that usually has extension .p12 or .pfx)
+CONFIG_PKCS12=y
+
+# RADIUS authentication server. This provides access to the integrated EAP
+# authenticator from external hosts using RADIUS.
+CONFIG_RADIUS_SERVER=y
============================================================
--- packages/hostap/hostap-daemon.inc eb25208dbdd6e1e4c06acacfaa125638545e1403
+++ packages/hostap/hostap-daemon.inc 5b468b01b285f0515e7e6f11f25cfc38131c14d0
@@ -7,6 +7,9 @@ DEPENDS_mtx-1_append = "madwifi-modules"
RDEPENDS = "hostap-modules hostap-utils (${PV})"
DEPENDS = "openssl"
DEPENDS_mtx-1_append = "madwifi-modules"
+DEPENDS_mtx-2_append = "madwifi-modules"
+CPPFLAGS_append_mtx-1 = " -I${STAGING_INCDIR}/madwifi/"
+CPPFLAGS_append_mtx-2 = " -I${STAGING_INCDIR}/madwifi/"
SRC_URI = "http://hostap.epitest.fi/releases/hostapd-${PV}.tar.gz \
file://makefile-cross.diff;patch=1;pnum=0 \
============================================================
--- packages/hostap/hostap-modules.inc df1207da14ba41eb7d3096f393c46cc404dd8ae8
+++ packages/hostap/hostap-modules.inc 25d727553b518e4c8a47a88c9a87f5bbc0ce3e5d
@@ -8,6 +8,8 @@ SRC_URI_append_mtx-1 = " file://mtx_comp
SRC_URI_append_mtx-1 = " file://mtx_compat.diff;patch=1;pnum=0 \
file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0"
+SRC_URI_append_mtx-2 = " file://mtx_compat.diff;patch=1;pnum=0 \
+ file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0"
SRC_URI_append_h3900 = " file://ipaq_compat.patch;patch=1 "
============================================================
--- packages/madwifi/madwifi-modules_cvs-bsd.bb 0869ae08141145db97b2e54fda194501b38459b7
+++ packages/madwifi/madwifi-modules_cvs-bsd.bb 929c4a31cb6f669d93685a22d436866c89b01aea
@@ -5,7 +5,8 @@ DEPENDS = "virtual/kernel"
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 @@ EXTRA_OEMAKE_mtx-1 = "TARGET=mips-le-elf
# 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() {
============================================================
--- packages/madwifi/madwifi-modules_cvs.bb 253becedd7bcaaca39b1d3f6f1afcef585ea8191
+++ packages/madwifi/madwifi-modules_cvs.bb aa7fff022dd9a02d4c8635b765740063acd5cc4d
@@ -5,9 +5,10 @@ DEPENDS = "virtual/kernel"
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 @@ COPTS='-G 0 -mno-abicalls -fno-pic -Wa,-
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,12 +28,21 @@ do_install() {
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() {
if test "x$D" != "x"; then
exit 1
More information about the Openembedded-commits
mailing list