enable non volatile firmware download

5 files changed, 146 insertions, 20 deletions

diff --git a/net-wireless/hostap-driver/ChangeLog b/net-wireless/hostap-driver/ChangeLog
index 7ff3d4799e57..3b5f2c380261 100644
--- a/net-wireless/hostap-driver/ChangeLog
+++ b/net-wireless/hostap-driver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/hostap-driver
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/ChangeLog,v 1.17 2004/11/01 11:49:36 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/ChangeLog,v 1.18 2004/11/27 00:50:22 wschlich Exp $
+
+*hostap-driver-0.2.5-r1 (27 Nov 2004)
+
+  27 Nov 2004; Wolfram Schlich <wschlich@gentoo.org>
+  +files/hostap-driver-0.2.5.firmware.diff.bz2,
+  +hostap-driver-0.2.5-r1.ebuild:
+  enable non volatile firmware download
 
   01 Nov 2004; Henrik Brix Andersen <brix@gentoo.org>
   hostap-driver-0.1.1.ebuild, hostap-driver-0.1.2-r1.ebuild,
diff --git a/net-wireless/hostap-driver/Manifest b/net-wireless/hostap-driver/Manifest
index def2ca31f456..2f761d9a450a 100644
--- a/net-wireless/hostap-driver/Manifest
+++ b/net-wireless/hostap-driver/Manifest
@@ -1,28 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 21e03519360fbce8cc94ba353e3bbced hostap-driver-0.1.3.ebuild 2922
-MD5 0357db35292e4c201c1506437bb3cc14 hostap-driver-0.1.2-r1.ebuild 3837
 MD5 4edd5bce6a9f6b95029457b5c01aa712 hostap-driver-0.1.2.ebuild 3734
-MD5 08b001ac4fb3ad3de51ef019a8833f6c hostap-driver-0.2.5.ebuild 3201
-MD5 64073e833299cf5c17ad5e2468e418e7 hostap-driver-0.1.2-r2.ebuild 2821
-MD5 cb742c4bf76c73ba75fd085f8fe1c595 ChangeLog 3159
-MD5 e4c2a5b184138acc2d5252edc1be21bc metadata.xml 822
 MD5 9bc449f25ca167e784ff540a4e27921a hostap-driver-0.1.1.ebuild 3734
+MD5 a4d4dbf44acc345fefbbb21cd93a0825 hostap-driver-0.2.5-r1.ebuild 3263
 MD5 d6feaba6faa14fd7f48bfbe13a2309dc hostap-driver-0.2.4.ebuild 2700
-MD5 78c715b9cdf2bea54162336e24f114d1 files/hostap-driver-0.1.3.firmware.diff.bz2 591
-MD5 5c57e0825ccb41c219c9d86c6a9114e5 files/digest-hostap-driver-0.1.2-r1 71
+MD5 0357db35292e4c201c1506437bb3cc14 hostap-driver-0.1.2-r1.ebuild 3837
+MD5 e4c2a5b184138acc2d5252edc1be21bc metadata.xml 822
+MD5 c4365e1c396c0c0c91682fb9588e5be6 ChangeLog 3378
+MD5 64073e833299cf5c17ad5e2468e418e7 hostap-driver-0.1.2-r2.ebuild 2821
+MD5 08b001ac4fb3ad3de51ef019a8833f6c hostap-driver-0.2.5.ebuild 3201
 MD5 7404c72c79e3c743a94815cff4146633 files/digest-hostap-driver-0.1.2-r2 441
 MD5 75dda0e477834ba5a6c5c88cfb402fe7 files/digest-hostap-driver-0.1.1 71
-MD5 5c57e0825ccb41c219c9d86c6a9114e5 files/digest-hostap-driver-0.1.2 71
-MD5 ca0acad8d1689a75901c99c700df0382 files/digest-hostap-driver-0.1.3 441
 MD5 fe9ca923fd63e570f4f47be989fd810f files/digest-hostap-driver-0.2.4 441
+MD5 5c57e0825ccb41c219c9d86c6a9114e5 files/digest-hostap-driver-0.1.2-r1 71
+MD5 5c57e0825ccb41c219c9d86c6a9114e5 files/digest-hostap-driver-0.1.2 71
 MD5 702e5e315551f06833fde599816fd65a files/digest-hostap-driver-0.2.5 441
 MD5 afb604f5408986228ad8cc60236339dc files/hostap-driver-0.1.2.firmware.diff.bz2 590
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBpQURI1lqEGTUzyQRAhcRAJ43B+bdFe+6f/xVrGBumvftknVUSACfTMKn
-ucyrGX/kUP467NSmSNdA56g=
-=2APf
------END PGP SIGNATURE-----
+MD5 b5d0426ea04be20cb11c152ae357e87f files/digest-hostap-driver-0.2.5-r1 71
+MD5 ca0acad8d1689a75901c99c700df0382 files/digest-hostap-driver-0.1.3 441
+MD5 78c715b9cdf2bea54162336e24f114d1 files/hostap-driver-0.1.3.firmware.diff.bz2 591
+MD5 9451f65d0b1724a60a07b9310d9ebc52 files/hostap-driver-0.2.5.firmware.diff.bz2 472
diff --git a/net-wireless/hostap-driver/files/digest-hostap-driver-0.2.5-r1 b/net-wireless/hostap-driver/files/digest-hostap-driver-0.2.5-r1
new file mode 100644
index 000000000000..5c33816d6391
--- /dev/null
+++ b/net-wireless/hostap-driver/files/digest-hostap-driver-0.2.5-r1
@@ -0,0 +1 @@
+MD5 6afe257b11554b17c228f7ca8c7ce0d4 hostap-driver-0.2.5.tar.gz 195923
diff --git a/net-wireless/hostap-driver/files/hostap-driver-0.2.5.firmware.diff.bz2 b/net-wireless/hostap-driver/files/hostap-driver-0.2.5.firmware.diff.bz2
new file mode 100644
index 000000000000..f777fa9b854c
--- /dev/null
+++ b/net-wireless/hostap-driver/files/hostap-driver-0.2.5.firmware.diff.bz2
diff --git a/net-wireless/hostap-driver/hostap-driver-0.2.5-r1.ebuild b/net-wireless/hostap-driver/hostap-driver-0.2.5-r1.ebuild
new file mode 100644
index 000000000000..09a46010d097
--- /dev/null
+++ b/net-wireless/hostap-driver/hostap-driver-0.2.5-r1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.2.5-r1.ebuild,v 1.1 2004/11/27 00:50:22 wschlich Exp $
+
+inherit toolchain-funcs pcmcia kernel-mod eutils
+
+DESCRIPTION="HostAP wireless drivers"
+HOMEPAGE="http://hostap.epitest.fi"
+SRC_URI="${SRC_URI} http://hostap.epitest.fi/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+
+KEYWORDS="~x86"
+IUSE=""
+SLOT="0"
+
+DEPEND="!net-wireless/hostap
+		virtual/linux-sources
+		sys-apps/sed"
+RDEPEND=">=net-wireless/wireless-tools-25"
+
+src_unpack() {
+	if ! kernel-mod_configoption_present NET_RADIO
+	then
+		eerror ""
+		eerror "${P} requires support for Wireless LAN drivers (non-hamradio) &"
+		eerror "Wireless Extensions (CONFIG_NET_RADIO) in the kernel."
+		eerror ""
+		die "CONFIG_NET_RADIO support not detected."
+	fi
+
+	kernel-mod_check_modules_supported
+
+	unpack ${A}
+
+	## set compiler
+	sed -i -e "s:gcc:$(tc-getCC):" ${S}/Makefile
+
+	# unpack the pcmcia-cs sources if needed
+	pcmcia_src_unpack
+
+	cd ${S}
+	epatch "${FILESDIR}/${P}.firmware.diff.bz2"
+
+	# fix for new coreutils (#31801)
+	sed -i "s:tail -1:tail -n 1:" ${S}/Makefile
+
+	# set correct pcmcia path (PCMCIA_VERSION gets set from pcmcia_src_unpack)
+	if [ -n "${PCMCIA_VERSION}" ]
+	then
+		sed -i "s:^PCMCIA_PATH=:PCMCIA_PATH=${PCMCIA_SOURCE_DIR}:" ${S}/Makefile
+	fi
+
+	# install to /lib/modules/${KV}/net
+	sed -i "s:\$(MODPATH)/kernel/drivers/net/wireless:\$(MODPATH)/net:g" ${S}/Makefile
+	sed -i "s:MODPATH_CS \:= \$(MODPATH)/pcmcia:MODPATH_CS \:= \$(MODPATH)/net:" ${S}/Makefile
+
+	# let pkg_postinst() handle depmod
+	sed -i "s:/sbin/depmod -ae; \\\:\\\:" ${S}/Makefile
+	sed -i "s:/sbin/depmod -ae::" ${S}/Makefile
+
+	if ! use pcmcia &> /dev/null
+	then
+		# remove install_pccard dependency from install_2.4 target
+		sed -i "s#^\(install_2.4:.*\)install_pccard#\1#" ${S}/Makefile
+	fi
+
+	kernel-mod_getversion
+
+	if [ ${KV_MINOR} -gt 5 ] && [ ${KV_PATCH} -gt 5 ]
+	then
+		sed -i "s:SUBDIRS=:M=:" ${S}/Makefile
+	fi
+}
+
+src_compile() {
+	pcmcia_configure
+
+	set_arch_to_kernel
+	emake all || die "emake failed"
+	set_arch_to_portage
+}
+
+src_install() {
+	# Makefile relies on existing /lib/modules/${KV}
+	dodir /lib/modules/${KV}
+
+	if use pcmcia &> /dev/null
+	then
+		# pcmcia configuration file is only installed if /etc/pcmcia exist
+		dodir /etc/pcmcia
+	else
+		# make sure we do not install the hostap_cs module
+		rm -rf ${S}/driver/modules/hostap_cs.*o
+	fi
+
+	set_arch_to_kernel
+	emake DESTDIR=${D} install || die "emake install failed"
+	set_arch_to_portage
+
+	dodoc README ChangeLog
+}
+
+pkg_postinst() {
+	einfo "Checking kernel module dependencies"
+	test -r "${ROOT}/usr/src/linux/System.map" && \
+		depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV}
+
+	if [ -e /etc/pcmcia/prism2.conf ]
+	then
+		einfo ""
+		einfo "You may need to edit or remove /etc/pcmcia/prism2.conf"
+		einfo "This is usually a result of conflicts with the"
+		einfo "net-wireless/linux-wlan-ng drivers."
+		einfo ""
+	fi
+
+	einfo ""
+	einfo "Please notice that all ${PN} modules are now installed to"
+	einfo "/lib/modules/${KV}/net/."
+	einfo ""
+	einfo "You may have to manually delete the old modules if upgrading from from"
+	einfo "<=net-wireless/${PN}-0.2.4."
+	einfo ""
+
+}