From 80772f29ec628112a93a91eda83d47198d232067 Mon Sep 17 00:00:00 2001 From: Felix Domke Date: Thu, 12 Jun 2008 11:00:22 +0000 Subject: madwifi: backport other changes from .dev --- .../madwifi/files/10-xscale-be-elf-copts.patch | 8 ++++---- .../madwifi/files/10-xscale-le-elf-copts.patch | 8 ++++---- .../madwifi/madwifi-modules-0.9.3/.mtn2git_empty | 0 packages/madwifi/madwifi-modules_cvs-bsd.bb | 7 +++---- packages/madwifi/madwifi-modules_cvs.bb | 9 ++++----- packages/madwifi/madwifi-ng_r.inc | 23 ++++++++++++++++------ 6 files changed, 32 insertions(+), 23 deletions(-) create mode 100644 packages/madwifi/madwifi-modules-0.9.3/.mtn2git_empty (limited to 'packages/madwifi') diff --git a/packages/madwifi/files/10-xscale-be-elf-copts.patch b/packages/madwifi/files/10-xscale-be-elf-copts.patch index 84915e03e2..1a08f3756e 100644 --- a/packages/madwifi/files/10-xscale-be-elf-copts.patch +++ b/packages/madwifi/files/10-xscale-be-elf-copts.patch @@ -1,10 +1,10 @@ ---- madwifi-ng/hal/public/xscale-be-elf.inc~ 2006-02-11 22:34:39.000000000 +1030 -+++ madwifi-ng/hal/public/xscale-be-elf.inc 2006-04-12 06:10:47.736463272 +0930 +--- madwifi.orig/hal/public/xscale-be-elf.inc 2007-01-03 23:42:09.000000000 -0600 ++++ madwifi/hal/public/xscale-be-elf.inc 2007-01-03 23:48:50.000000000 -0600 @@ -77,5 +77,5 @@ LDOPTS= -EB COPTS+= -DAH_BYTE_ORDER=AH_BIG_ENDIAN -COPTS+= -march=armv4 -mbig-endian -fno-strict-aliasing -fno-common -mapcs-32 \ -- -mtune=xscale -mshort-load-bytes -msoft-float -mfp=2 +- -mtune=xscale -mshort-load-bytes +COPTS+= -march=armv4 -mbig-endian -fno-strict-aliasing -fno-common \ -+ -mtune=xscale -msoft-float -mfp=2 ++ -mtune=xscale diff --git a/packages/madwifi/files/10-xscale-le-elf-copts.patch b/packages/madwifi/files/10-xscale-le-elf-copts.patch index 7ab46e16b3..c4d9937220 100644 --- a/packages/madwifi/files/10-xscale-le-elf-copts.patch +++ b/packages/madwifi/files/10-xscale-le-elf-copts.patch @@ -1,8 +1,8 @@ ---- madwifi-ng/hal/public/xscale-le-elf.inc~ 2006-04-12 06:09:56.669226672 +0930 -+++ madwifi-ng/hal/public/xscale-le-elf.inc 2006-04-12 05:52:11.658132968 +0930 +--- madwifi.orig/hal/public/xscale-le-elf.inc 2007-01-03 23:42:06.000000000 -0600 ++++ madwifi/hal/public/xscale-le-elf.inc 2007-01-03 23:48:50.000000000 -0600 @@ -79,4 +79,4 @@ LDOPTS= -EL COPTS+= -DAH_BYTE_ORDER=AH_LITTLE_ENDIAN COPTS+= -march=armv4 -mlittle-endian -fno-strict-aliasing -fno-common \ -- -mapcs-32 -mtune=xscale -mshort-load-bytes -msoft-float -mfp=2 -+ -mtune=xscale -msoft-float -mfp=2 +- -mapcs-32 -mtune=xscale -mshort-load-bytes ++ -mtune=xscale diff --git a/packages/madwifi/madwifi-modules-0.9.3/.mtn2git_empty b/packages/madwifi/madwifi-modules-0.9.3/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/madwifi/madwifi-modules_cvs-bsd.bb b/packages/madwifi/madwifi-modules_cvs-bsd.bb index be6de0663f..d570816fc1 100644 --- a/packages/madwifi/madwifi-modules_cvs-bsd.bb +++ b/packages/madwifi/madwifi-modules_cvs-bsd.bb @@ -1,14 +1,13 @@ DESCRIPTION = "Linux driver for 802.11a/b/g universal NIC cards using Atheros chip sets" SECTION = "base" PRIORITY = "optional" -MAINTAINER = "Bruno Randolf " LICENSE = "GPL" RDEPENDS = "kernel (${KERNEL_VERSION})" DEPENDS = "virtual/kernel" 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}" +SRC_URI = "cvs://anonymous@madwifi.cvs.sourceforge.net/cvsroot/madwifi;module=madwifi;tag=BSD;date=${SRCDATE}" S = "${WORKDIR}/madwifi" @@ -28,7 +27,7 @@ do_compile() { do_install() { oe_runmake DESTDIR=${D} install install -d ${D}${sbindir} - cd tools; + cd tools; oe_runmake DESTDIR=${D} BINDIR=${sbindir} install install -m 755 athchans athctrl athkey ${D}${sbindir} } @@ -48,6 +47,6 @@ else fi } -PACKAGES = "madwifi-tools ${PN}" +PACKAGES = "${PN}-dbg madwifi-tools ${PN}" FILES_${PN} = "/lib/modules/" FILES_madwifi-tools = "/usr/" diff --git a/packages/madwifi/madwifi-modules_cvs.bb b/packages/madwifi/madwifi-modules_cvs.bb index bc89d84a15..c5cf6cf806 100644 --- a/packages/madwifi/madwifi-modules_cvs.bb +++ b/packages/madwifi/madwifi-modules_cvs.bb @@ -1,14 +1,13 @@ DESCRIPTION = "Linux driver for 802.11a/b/g universal NIC cards using Atheros chip sets" SECTION = "base" PRIORITY = "optional" -MAINTAINER = "Bruno Randolf " LICENSE = "GPL" RDEPENDS = "kernel (${KERNEL_VERSION})" DEPENDS = "virtual/kernel" SRCDATE = "20050803" PV = "1.0.0+cvs${SRCDATE}" -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/madwifi;module=madwifi;date=${SRCDATE}" +SRC_URI = "cvs://anonymous@madwifi.cvs.sourceforge.net/cvsroot/madwifi;module=madwifi;date=${SRCDATE}" S = "${WORKDIR}/madwifi" @@ -29,7 +28,7 @@ do_compile() { do_install() { oe_runmake DESTDIR=${D} install install -d ${D}/${sbindir} - cd tools; + cd tools; oe_runmake DESTDIR=${D} BINDIR=${sbindir} install install -m 755 athchans athctrl athkey ${D}/${sbindir} } @@ -40,7 +39,7 @@ do_stage() { 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 . + rm -f compat.h; ln -s ../include/compat.h . } pkg_postinst() { @@ -51,6 +50,6 @@ else fi } -PACKAGES = "madwifi-tools ${PN}" +PACKAGES = "${PN}-dbg madwifi-tools ${PN}" FILES_${PN} = "/lib/modules/" FILES_madwifi-tools = "/usr/" diff --git a/packages/madwifi/madwifi-ng_r.inc b/packages/madwifi/madwifi-ng_r.inc index 488d9aefa4..be2b889da7 100644 --- a/packages/madwifi/madwifi-ng_r.inc +++ b/packages/madwifi/madwifi-ng_r.inc @@ -1,24 +1,35 @@ DESCRIPTION = "Linux driver for 802.11a/b/g universal NIC cards using Atheros chip sets" SECTION = "base" PRIORITY = "optional" -MAINTAINER = "NSLU2 Linux " LICENSE = "GPL" RDEPENDS = "kernel (${KERNEL_VERSION})" DEPENDS = "virtual/kernel" -PR="r0" +PR="r5" -SRC_URI = "http://snapshots.madwifi.org/${PN}/${PN}-${PV}.tar.gz \ +WACKELF_SRC_URI = "" +WACKELF_SRC_URI_ixp4xx = " file://20-xscale-VFP-wackelf.patch;patch=1" +WACKELF_SRC_URI_compulab-pxa270 = " file://20-xscale-VFP-wackelf.patch;patch=1" + +SRC_URI = "http://snapshots.madwifi.org/madwifi-trunk/${PN}-${PV}.tar.gz \ file://10-xscale-be-elf-copts.patch;patch=1 \ file://10-xscale-le-elf-copts.patch;patch=1 \ - file://10-sh4-le-elf-copts.patch;patch=1" + file://10-sh4-le-elf-copts.patch;patch=1 \ + ${WACKELF_SRC_URI}" S = "${WORKDIR}/${PN}-${PV}" inherit module-base +ARCH_efika="powerpc" +ARCH_dht-walnut="ppc" +ARCH_magicbox="ppc" +ARCH_sequoia="ppc" + EXTRA_OEMAKE = "LDFLAGS= KERNELPATH=${STAGING_KERNEL_DIR} KERNELRELEASE=${KERNEL_VERSION} TOOLPREFIX=${TARGET_PREFIX}" -EXTRA_OEMAKE_prepend_slugos = "TARGET=xscale-${ARCH_BYTE_SEX}-elf " +EXTRA_OEMAKE_prepend_ixp4xxle = "TARGET=xscale-le-elf " +EXTRA_OEMAKE_prepend_ixp4xxbe = "TARGET=xscale-be-elf " + do_compile() { oe_runmake all @@ -44,6 +55,6 @@ else fi } -PACKAGES = "${PN}-modules ${PN}-tools" +PACKAGES += "${PN}-modules ${PN}-tools" FILES_${PN}-modules = "/lib/modules/" FILES_${PN}-tools = "/usr/" -- cgit 1.2.3-korg