diff options
| author |   Henrik Brix Andersen <brix@gentoo.org> | 2004-10-24 14:08:22 +0000 |
|---|---|---|
| committer | Henrik Brix Andersen <brix@gentoo.org> | 2004-10-24 14:08:22 +0000 |
| commit | 82a60ccb8fe5f3063f4d5a4c0adf927f1b941652 (patch) | |
| tree | ce273d765ba420187325c658e20ee4a69bcaa674 /net-wireless | |
| parent | Bad bash logic... [ v. ). (Manifest recommit) (diff) | |
| download | gentoo-2-82a60ccb8fe5f3063f4d5a4c0adf927f1b941652.tar.gz gentoo-2-82a60ccb8fe5f3063f4d5a4c0adf927f1b941652.tar.bz2 gentoo-2-82a60ccb8fe5f3063f4d5a4c0adf927f1b941652.zip | |
Fix bug #68591.
Diffstat (limited to 'net-wireless')
| -rw-r--r-- | net-wireless/ipw2100/ChangeLog | 6 | ||||
| -rw-r--r-- | net-wireless/ipw2100/ipw2100-0.56-r1.ebuild | 31 |
2 files changed, 22 insertions, 15 deletions
diff --git a/net-wireless/ipw2100/ChangeLog b/net-wireless/ipw2100/ChangeLog index dc019230fd12..ee6281da2476 100644 --- a/net-wireless/ipw2100/ChangeLog +++ b/net-wireless/ipw2100/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-wireless/ipw2100 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.37 2004/10/21 08:13:25 brix Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.38 2004/10/24 14:08:22 brix Exp $ + + 24 Oct 2004; Henrik Brix Andersen <brix@gentoo.org> ipw2100-0.56-r1.ebuild: + Test all needed kernel options before bailing out. Thanks to Rudi Lippert + <gentoo at lyrikpage dot de> in bug #68591. 21 Oct 2004; Henrik Brix Andersen <brix@gentoo.org> ipw2100-0.56-r1.ebuild, ipw2100-0.56.ebuild: diff --git a/net-wireless/ipw2100/ipw2100-0.56-r1.ebuild b/net-wireless/ipw2100/ipw2100-0.56-r1.ebuild index af5b5c3724bd..6fc790a4b7f9 100644 --- a/net-wireless/ipw2100/ipw2100-0.56-r1.ebuild +++ b/net-wireless/ipw2100/ipw2100-0.56-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-0.56-r1.ebuild,v 1.2 2004/10/21 08:13:25 brix Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-0.56-r1.ebuild,v 1.3 2004/10/24 14:08:22 brix Exp $ inherit kernel-mod eutils @@ -18,19 +18,21 @@ SLOT="0" KEYWORDS="~x86" IUSE="" -DEPEND="!net-wireless/ipw2200 +DEPEND="virtual/linux-sources + !net-wireless/ipw2200 sys-apps/sed" RDEPEND=">=sys-apps/hotplug-20030805-r2 >=net-wireless/wireless-tools-27_pre23" src_unpack() { + local DIE=0 + 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." + DIE=1 fi if ! kernel-mod_configoption_present CRYPTO_ARC4 @@ -38,8 +40,7 @@ src_unpack() { eerror "" eerror "${P} requires support for ARC4 cipher algorithm (CONFIG_CRYPTO_ARC4)" eerror "in the kernel." - eerror "" - die "CONFIG_CRYPTO_ARC4 support not detected." + DIE=1 fi if ! kernel-mod_configoption_present CRYPTO_MICHAEL_MIC @@ -47,8 +48,7 @@ src_unpack() { eerror "" eerror "${P} requires support for Michael MIC keyed digest algorithm" eerror "(CONFIG_CRYPTO_MICHAEL_MIC) in the kernel." - eerror "" - die "CONFIG_CRYPTO_MICHAEL_MIC support not detected." + DIE=1 fi if ! kernel-mod_configoption_present CRYPTO_AES_586 && ! kernel-mod_configoption_present CRYPTO_AES @@ -58,8 +58,7 @@ src_unpack() { eerror "(CONFIG_CRYPTO_AES_586) in the kernel." eerror "" eerror "This is called CONFIG_CRYPTO_AES in kernels prior to 2.6.8." - eerror "" - die "CONFIG_CRYPTO_AES_586 support not detected." + DIE=1 fi if ! kernel-mod_configoption_present FW_LOADER @@ -67,8 +66,7 @@ src_unpack() { eerror "" eerror "${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)" eerror "in the kernel." - eerror "" - die "CONFIG_FW_LOADER support not detected." + DIE=1 fi if ! kernel-mod_configoption_present CRC32 @@ -76,12 +74,17 @@ src_unpack() { eerror "" eerror "${P} requires support for CRC32 functions (CONFIG_CRC32) in the" eerror "kernel." - eerror "" - die "CONFIG_CRC32 support not detected." + DIE=1 fi kernel-mod_check_modules_supported + if [ $DIE -eq 1 ] + then + eerror "" + die "You kernel is missing the required option(s) listed above." + fi + unpack ${A} if kernel-mod_is_2_4_kernel |