From 3ed09d80db902be01812b1313e9c2bebd9e03af4 Mon Sep 17 00:00:00 2001 From: Ned Ludd Date: Fri, 7 Jan 2005 16:43:17 +0000 Subject: [PATCH] - version bump for 2.6.x kernels --- net-wireless/madwifi-driver/ChangeLog | 11 ++- net-wireless/madwifi-driver/Manifest | 18 ++--- .../digest-madwifi-driver-0.1_pre20040824-r1 | 1 - .../digest-madwifi-driver-0.1_pre20040906 | 2 - .../digest-madwifi-driver-0.1_pre20050106 | 1 + .../madwifi-driver-0.1_pre20040824-r1.ebuild | 79 ------------------- .../madwifi-driver-0.1_pre20041019.ebuild | 4 +- ... => madwifi-driver-0.1_pre20050106.ebuild} | 31 +++++--- 8 files changed, 41 insertions(+), 106 deletions(-) delete mode 100644 net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20040824-r1 delete mode 100644 net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20040906 create mode 100644 net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20050106 delete mode 100644 net-wireless/madwifi-driver/madwifi-driver-0.1_pre20040824-r1.ebuild rename net-wireless/madwifi-driver/{madwifi-driver-0.1_pre20040906.ebuild => madwifi-driver-0.1_pre20050106.ebuild} (63%) diff --git a/net-wireless/madwifi-driver/ChangeLog b/net-wireless/madwifi-driver/ChangeLog index 2b81e477c71c..c6e80c5f05a7 100644 --- a/net-wireless/madwifi-driver/ChangeLog +++ b/net-wireless/madwifi-driver/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-wireless/madwifi-driver -# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-driver/ChangeLog,v 1.16 2004/10/22 19:16:11 solar Exp $ +# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-driver/ChangeLog,v 1.17 2005/01/07 16:43:17 solar Exp $ + +*madwifi-driver-0.1_pre20050106 (07 Jan 2005) + + 07 Jan 2005; -madwifi-driver-0.1_pre20040824-r1.ebuild, + -madwifi-driver-0.1_pre20040906.ebuild, + +madwifi-driver-0.1_pre20050106.ebuild: + - version bump for 2.6.x kernels 22 Oct 2004; madwifi-driver-0.1_pre20041019.ebuild: added app-arch/sharutils to DEPEND diff --git a/net-wireless/madwifi-driver/Manifest b/net-wireless/madwifi-driver/Manifest index c81a073379a8..5962c9b9e450 100644 --- a/net-wireless/madwifi-driver/Manifest +++ b/net-wireless/madwifi-driver/Manifest @@ -1,21 +1,21 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 4eb7055c0754eae2196a69d67bf07ccf madwifi-driver-0.1_pre20041019.ebuild 1971 -MD5 6032a094345439c5e3cacceba81ff88d madwifi-driver-0.1_pre20040906.ebuild 1909 -MD5 1a16939fd642822942a5fa5e376f0626 ChangeLog 3621 +MD5 eb4537464be469fe1276078d9269910e madwifi-driver-0.1_pre20041019.ebuild 1971 +MD5 6d574164f80c5933ed699a6fede7d28e madwifi-driver-0.1_pre20050106.ebuild 2174 +MD5 a164005448b4adba47e9dc1ee743ea49 ChangeLog 3865 MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159 -MD5 f232721a5c111d2fec3a8697f67bd886 madwifi-driver-0.1_pre20040824-r1.ebuild 2015 -MD5 527d277dc2fea62fb5a3ae7f54c98e33 files/digest-madwifi-driver-0.1_pre20040906 174 MD5 87299a7ead5bf030018e9fa58f2cdf86 files/digest-madwifi-driver-0.1_pre20041019 84 +MD5 07d3f62f481b9725f606d77cd023edd5 files/digest-madwifi-driver-0.1_pre20050106 84 MD5 807179e31533b4895664bff1421f4381 files/madwifi-multi-ssid-support.patch 3343 MD5 d9ea69973349d71e055b16a64039f1b7 files/madwifi-driver-2.6.8-20040814-proc_dointvec.patch 1749 MD5 444756b2062924ee7e0e631e956d46e9 files/madwifi-driver-0.1-arp-packets-33958.patch 704 -MD5 fd47ace81248afcc8e4a192715a9bfe2 files/digest-madwifi-driver-0.1_pre20040824-r1 84 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (GNU/Linux) -iD8DBQFBeVwo94CCfB4KcwwRAuwgAJ99kZsO4i2RaBsXFCSzfMGU/mEGfgCcDPvd -ZC27jaTs3X3GK8bWCTeR2tk= -=jT8q +iQCVAwUBQd67hZ4WFLgrx1GWAQJr2QQArRsIqr2IB3FMgACaVR/PzbhxQ5UWuJkC +4dZuCqqMF3YZXHI9kUQpw6IQG7rT60wz6Ol5uyeALdoLh7pBDQXzR8mRR7miOox4 +/QBphicnmTGYQz1Nj4c4h6cVZR+s+/H2skwMGU8J3s+9Cp74UyOTGiYXiVJHWUwU +gZ+P+1cIO3c= +=h0C7 -----END PGP SIGNATURE----- diff --git a/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20040824-r1 b/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20040824-r1 deleted file mode 100644 index a22b2a8c7cd5..000000000000 --- a/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20040824-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 fb4c2a2564d12dd26f9dd0297537eecc madwifi-driver-0.1_pre20040824.tar.bz2 1733884 diff --git a/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20040906 b/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20040906 deleted file mode 100644 index 629ec6db7346..000000000000 --- a/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20040906 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 6c5f62812f30b962e054782b9cec7b9c madwifi-driver-0.1_pre20040906.tar.bz2 1797060 -MD5 92dabb486c920c0e82ad1b3ed08404c1 madwifi-driver-0.1_pre20040906-gentoo.patch.bz2 2530 diff --git a/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20050106 b/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20050106 new file mode 100644 index 000000000000..0dff41f1aae5 --- /dev/null +++ b/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20050106 @@ -0,0 +1 @@ +MD5 ecefaf41bbe0c4045c15e9e63a9ce3cf madwifi-driver-0.1_pre20050106.tar.bz2 1639445 diff --git a/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20040824-r1.ebuild b/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20040824-r1.ebuild deleted file mode 100644 index 508e1a931c7e..000000000000 --- a/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20040824-r1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20040824-r1.ebuild,v 1.1 2004/08/29 04:41:33 solar Exp $ - -# All work on madwifi is pretty much done under the WPA branch. At some -# point in the near future it should be merged back into HEAD. -# cvs -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/madwifi co -r WPA madwifi - -inherit eutils kernel-mod - -DESCRIPTION="Wireless driver for Atheros chipset a/b/g cards" -HOMEPAGE="http://madwifi.sourceforge.net/" - -# Point to any required sources; these will be automatically downloaded by -# Portage. -SRC_URI="mirror://gentoo/$P.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" - -KEYWORDS="~x86" -IUSE="" -DEPEND="" - -S=${WORKDIR} - -pkg_setup() { - if [[ "${KV}" > "2.5" ]] ; then - cd ${ROOT}/usr/src/linux - if [[ "${KV}" > "2.6.8" ]] ; then - ./scripts/mod/modpost ./vmlinux - else - ./scripts/modpost ./vmlinux - fi - fi -} - -src_unpack() { - check_KV - unpack ${A} - cd ${S} - - # http://article.gmane.org/gmane.linux.drivers.madwifi.user/4033 - epatch ${FILESDIR}/madwifi-multi-ssid-support.patch - - if kernel-mod_is_2_6_kernel && [ ${KV_PATCH} -gt 5 ]; then - for dir in ath ath_hal net80211; do - sed -i -e "s:SUBDIRS=:M=:" ${S}/${dir}/Makefile - done - - [[ "${KV_PATCH}" -ge 8 ]] && epatch ${FILESDIR}/${PN}-2.6.8-20040814-proc_dointvec.patch - fi -} - -src_compile() { - unset ARCH - make clean - make KERNELPATH="${ROOT}/usr/src/linux" KERNELRELEASE="${KV}" || die -} - -src_install() { - unset ARCH - make KERNELPATH="${ROOT}/usr/src/linux" KERNELRELEASE="${KV}" \ - DESTDIR="${D}" install || die - - dodoc README -} - -pkg_postinst() { - - [ -r "${ROOT}/usr/src/linux/System.map" ] && \ - depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV} - - einfo "" - einfo "The madwifi drivers create an interface named 'athX'" - einfo "Create /etc/init.d/net.ath0 and add a line for athX" - einfo "in /etc/conf.d/net like 'iface_ath0=\"dhcp\"'" - einfo "" -} diff --git a/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20041019.ebuild b/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20041019.ebuild index f5da8b2df71f..8d47380d34ff 100644 --- a/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20041019.ebuild +++ b/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20041019.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20041019.ebuild,v 1.2 2004/10/22 19:16:11 solar Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20041019.ebuild,v 1.3 2005/01/07 16:43:17 solar Exp $ # cvs -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/madwifi login # cvs -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/madwifi co -r HEAD madwifi diff --git a/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20040906.ebuild b/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20050106.ebuild similarity index 63% rename from net-wireless/madwifi-driver/madwifi-driver-0.1_pre20040906.ebuild rename to net-wireless/madwifi-driver/madwifi-driver-0.1_pre20050106.ebuild index a8f05a99cc7e..b36e7a42586f 100644 --- a/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20040906.ebuild +++ b/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20050106.ebuild @@ -1,10 +1,12 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20040906.ebuild,v 1.2 2004/10/19 18:49:42 solar Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20050106.ebuild,v 1.1 2005/01/07 16:43:17 solar Exp $ -# All work on madwifi is pretty much done under the WPA branch. At some -# point in the near future it should be merged back into HEAD. -# cvs -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/madwifi co -r WPA madwifi +# Be sure when we bump madwifi-driver that we also bump madwifi-tools at +# the same time as they use the same snapshot tarball. +# cvs -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/madwifi login +# cvs -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/madwifi co -r HEAD madwifi +# cvs -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/madwifi logout inherit eutils kernel-mod @@ -13,14 +15,16 @@ HOMEPAGE="http://madwifi.sourceforge.net/" # Point to any required sources; these will be automatically downloaded by # Portage. -SRC_URI="mirror://gentoo/${P}.tar.bz2 mirror://gentoo/${PN}-${PV}-gentoo.patch.bz2" +SRC_URI="mirror://gentoo/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86" +#KEYWORDS="~x86 ~amd64" +KEYWORDS="-*" IUSE="" -DEPEND="" +DEPEND="app-arch/sharutils" +RDEPEND="" S=${WORKDIR} @@ -33,6 +37,9 @@ pkg_setup() { && ./scripts/modpost ./vmlinux fi fi + use x86 && TARGET=i386-elf + use amd64 && TARGET=x86_64-elf + export TARGET } src_unpack() { @@ -40,7 +47,7 @@ src_unpack() { unpack ${A} cd ${S} - epatch ${DISTDIR}/${PN}-${PV}-gentoo.patch.bz2 + #epatch ${FILESDIR}/madwifi-multi-ssid-support.patch if kernel-mod_is_2_6_kernel && [ ${KV_PATCH} -gt 5 ]; then for dir in ath ath_hal net80211; do @@ -52,13 +59,15 @@ src_unpack() { src_compile() { unset ARCH make clean - make KERNELPATH="${ROOT}/usr/src/linux" KERNELRELEASE="${KV}" || die + + make KERNELPATH="${ROOT}/usr/src/linux" KERNELRELEASE="${KV}" \ + TARGET="${TARGET}" || die } src_install() { unset ARCH make KERNELPATH="${ROOT}/usr/src/linux" KERNELRELEASE="${KV}" \ - DESTDIR="${D}" install || die + TARGET="${TARGET}" DESTDIR="${D}" install || die dodoc README COPYRIGHT } -- 2.26.2