summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenrik Brix Andersen <brix@gentoo.org>2005-08-29 20:05:01 +0000
committerHenrik Brix Andersen <brix@gentoo.org>2005-08-29 20:05:01 +0000
commit5102f3994141dd8734dcdfad1ae7f5baab75ff55 (patch)
tree4d8b8062c50bc155bd2f4ff309f073d445a35804 /net-wireless
parentAdd fix for WPA when using hwcrypto. Allow compiling against sys-kernel/suspe... (diff)
downloadgentoo-2-5102f3994141dd8734dcdfad1ae7f5baab75ff55.tar.gz
gentoo-2-5102f3994141dd8734dcdfad1ae7f5baab75ff55.tar.bz2
gentoo-2-5102f3994141dd8734dcdfad1ae7f5baab75ff55.zip
Allow compiling against sys-kernel/suspend2-sources-2.6.13.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'net-wireless')
-rw-r--r--net-wireless/ipw2100/ChangeLog8
-rw-r--r--net-wireless/ipw2100/Manifest5
-rw-r--r--net-wireless/ipw2100/files/digest-ipw2100-1.1.2-r21
-rw-r--r--net-wireless/ipw2100/files/ipw2100-1.1.2-suspend2.patch16
-rw-r--r--net-wireless/ipw2100/ipw2100-1.1.2-r2.ebuild86
5 files changed, 114 insertions, 2 deletions
diff --git a/net-wireless/ipw2100/ChangeLog b/net-wireless/ipw2100/ChangeLog
index c1085c6c6af8..18485dda5023 100644
--- a/net-wireless/ipw2100/ChangeLog
+++ b/net-wireless/ipw2100/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-wireless/ipw2100
# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.81 2005/08/16 12:31:36 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.82 2005/08/29 20:05:01 brix Exp $
+
+*ipw2100-1.1.2-r2 (29 Aug 2005)
+
+ 29 Aug 2005; Henrik Brix Andersen <brix@gentoo.org>
+ +files/ipw2100-1.1.2-suspend2.patch, +ipw2100-1.1.2-r2.ebuild:
+ Allow compiling against sys-kernel/suspend2-sources-2.6.13.
16 Aug 2005; Henrik Brix Andersen <brix@gentoo.org>
ipw2100-1.1.2-r1.ebuild:
diff --git a/net-wireless/ipw2100/Manifest b/net-wireless/ipw2100/Manifest
index 73c4fcd93e2c..74ecea0c5bae 100644
--- a/net-wireless/ipw2100/Manifest
+++ b/net-wireless/ipw2100/Manifest
@@ -1,8 +1,9 @@
MD5 b127f38ac73f49d85ec8df711c7f0b83 ipw2100-1.1.0.ebuild 2303
+MD5 e2724c5fb608fb426477004b2920252f ipw2100-1.1.2-r2.ebuild 2127
MD5 a676f6646db638eab14c1a2b811ddefb ipw2100-1.1.2.ebuild 2124
MD5 0863db88acaaa293aeec4d9e4d8f1097 ipw2100-1.1.2-r1.ebuild 2190
MD5 b798c8a8a65771fb6b6bb0414f4f2517 ipw2100-1.1.1.ebuild 2124
-MD5 8c607b8bc7e86957c3e4ce212a2339c0 ChangeLog 15255
+MD5 27cae69a1db9d63a1416ee5a9169525b ChangeLog 15470
MD5 172db10566470c8f64b5911609a8e5f9 metadata.xml 318
MD5 c32c1e1a4a1d8797a8663db73c4cebe4 ipw2100-1.0.5.ebuild 2296
MD5 5fb2369d48eb758371baed2ff166ce10 files/ipw2100-1.1.0-suspend2.patch 1173
@@ -12,6 +13,8 @@ MD5 8c080b5455def312dc8b8fb2da3ffa12 files/digest-ipw2100-1.1.0 62
MD5 b42adf38a171429000f5d3e54bc190c4 files/digest-ipw2100-1.1.1 61
MD5 b99dfc5774c917655aa0b61b35a8e985 files/digest-ipw2100-1.1.2 61
MD5 45b8329213881abb9eb1569b92b1c080 files/ipw2100-1.0.5-suspend2.patch 1173
+MD5 fd4652f3d313404bf302ab38fc73f645 files/ipw2100-1.1.2-suspend2.patch 599
MD5 1d5956b3a796c4efc0ff535405df4e66 files/ipw2100-1.1.2-ieee80211-1.0.3.patch 437
MD5 b99dfc5774c917655aa0b61b35a8e985 files/digest-ipw2100-1.1.2-r1 61
+MD5 b99dfc5774c917655aa0b61b35a8e985 files/digest-ipw2100-1.1.2-r2 61
MD5 963a9937088ce7886c88a7553921d142 files/ipw2100-1.1.0-is_multicast_ether_addr.patch 695
diff --git a/net-wireless/ipw2100/files/digest-ipw2100-1.1.2-r2 b/net-wireless/ipw2100/files/digest-ipw2100-1.1.2-r2
new file mode 100644
index 000000000000..4b331357f2ff
--- /dev/null
+++ b/net-wireless/ipw2100/files/digest-ipw2100-1.1.2-r2
@@ -0,0 +1 @@
+MD5 604d44b15a0e0653897ca323310253dc ipw2100-1.1.2.tgz 99001
diff --git a/net-wireless/ipw2100/files/ipw2100-1.1.2-suspend2.patch b/net-wireless/ipw2100/files/ipw2100-1.1.2-suspend2.patch
new file mode 100644
index 000000000000..0b3ca2a88e5e
--- /dev/null
+++ b/net-wireless/ipw2100/files/ipw2100-1.1.2-suspend2.patch
@@ -0,0 +1,16 @@
+diff -urp ipw2100-1.1.2/ipw2100.c ipw2100-1.1.2-suspend2/ipw2100.c
+--- ipw2100-1.1.2/ipw2100.c 2005-07-13 20:59:37.000000000 +0200
++++ ipw2100-1.1.2-suspend2/ipw2100.c 2005-08-29 18:19:16.000000000 +0200
+@@ -6150,12 +6150,7 @@ static struct net_device *ipw2100_alloc_
+ INIT_LIST_HEAD(&priv->fw_pend_list);
+ INIT_STAT(&priv->fw_pend_stat);
+
+-
+-#ifdef PF_SYNCTHREAD
+- priv->workqueue = create_workqueue(DRV_NAME, 0);
+-#else
+ priv->workqueue = create_workqueue(DRV_NAME);
+-#endif
+ INIT_WORK(&priv->reset_work,
+ (void (*)(void *))ipw2100_reset_adapter, priv);
+ INIT_WORK(&priv->security_work,
diff --git a/net-wireless/ipw2100/ipw2100-1.1.2-r2.ebuild b/net-wireless/ipw2100/ipw2100-1.1.2-r2.ebuild
new file mode 100644
index 000000000000..831aece08ce4
--- /dev/null
+++ b/net-wireless/ipw2100/ipw2100-1.1.2-r2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-1.1.2-r2.ebuild,v 1.1 2005/08/29 20:05:01 brix Exp $
+
+inherit eutils linux-mod
+
+# The following works with both pre-releases and releases
+MY_P=${P/_/-}
+S=${WORKDIR}/${MY_P}
+
+IEEE80211_VERSION="1.0.3"
+FW_VERSION="1.3"
+
+DESCRIPTION="Driver for the Intel PRO/Wireless 2100 3B miniPCI adapter"
+HOMEPAGE="http://ipw2100.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+IUSE="debug"
+DEPEND=">=net-wireless/ieee80211-${IEEE80211_VERSION}"
+RDEPEND="${DEPEND}
+ =net-wireless/ipw2100-firmware-${FW_VERSION}
+ >=net-wireless/wireless-tools-27_pre23"
+
+BUILD_TARGETS="all"
+MODULE_NAMES="ipw2100(net/wireless:)"
+MODULESD_IPW2100_DOCS="README.ipw2100"
+
+CONFIG_CHECK="NET_RADIO FW_LOADER"
+ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
+ERROR_FW_LOADER="${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)."
+
+pkg_setup() {
+ linux-mod_pkg_setup
+
+ if kernel_is 2 4; then
+ die "${P} does not support building against kernel 2.4.x"
+ fi
+
+ BUILD_PARAMS="KSRC=${KV_DIR} KSRC_OUTPUT=${KV_OUT_DIR} IEEE80211_INC=/usr/include"
+}
+
+src_unpack() {
+ local debug="n"
+
+ unpack ${A}
+
+ cd ${S}
+ epatch ${FILESDIR}/${P}-ieee80211-1.0.3.patch
+ epatch ${FILESDIR}/${P}-suspend2.patch
+
+ use debug && debug="y"
+ sed -i -e "s:^\(CONFIG_IPW_DEBUG\)=.*:\1=$debug:" ${S}/Makefile
+}
+
+src_compile() {
+ einfo
+ einfo "You may safely ignore any errors from compilation that contain"
+ einfo "warnings about undefined references to the ieee80211 subsystem."
+ einfo
+
+ linux-mod_src_compile
+}
+
+src_install() {
+ linux-mod_src_install
+
+ dodoc CHANGES
+}
+
+pkg_postinst() {
+ linux-mod_pkg_postinst
+
+ if [ -f /lib/modules/${KV_FULL}/net/${PN}.ko ]; then
+ einfo
+ einfo "Modules from an earlier installation detected. You will need to manually"
+ einfo "remove those modules by running the following commands:"
+ einfo " # rm -f /lib/modules/${KV_FULL}/net/${PN}.ko"
+ einfo " # rm -f /lib/modules/${KV_FULL}/net/ieee80211*.ko"
+ einfo " # depmod -a"
+ einfo
+ fi
+}