From 96b67b3cb2ca9a60f28c9924efb909b7bd3d1d34 Mon Sep 17 00:00:00 2001 From: Stefan Schweizer Date: Fri, 27 Jul 2007 06:21:23 +0000 Subject: CONFIG_CHECK for WIRELESS_EXT so it also works with 2.6.22 and add a 2.6.22 patch thanks to Thomas S. Howard in bug 185845 (Portage version: 2.1.3_rc9) --- net-wireless/acx/ChangeLog | 9 ++++- net-wireless/acx/acx-0.3.35.ebuild | 43 ---------------------- net-wireless/acx/acx-0.3.35_p20060521.ebuild | 6 +-- net-wireless/acx/acx-0.3.35_p20070101.ebuild | 5 ++- net-wireless/acx/files/acx-0.3.35-2.6.18.patch | 14 ------- .../acx/files/acx-0.3.35_p20070101-2.6.22.patch | 29 +++++++++++++++ net-wireless/acx/files/digest-acx-0.3.35 | 3 -- 7 files changed, 43 insertions(+), 66 deletions(-) delete mode 100644 net-wireless/acx/acx-0.3.35.ebuild delete mode 100644 net-wireless/acx/files/acx-0.3.35-2.6.18.patch create mode 100644 net-wireless/acx/files/acx-0.3.35_p20070101-2.6.22.patch delete mode 100644 net-wireless/acx/files/digest-acx-0.3.35 (limited to 'net-wireless') diff --git a/net-wireless/acx/ChangeLog b/net-wireless/acx/ChangeLog index 28c6aba117c0..f1e36a84aa83 100644 --- a/net-wireless/acx/ChangeLog +++ b/net-wireless/acx/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-wireless/acx # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/acx/ChangeLog,v 1.11 2007/02/04 15:18:39 spb Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/acx/ChangeLog,v 1.12 2007/07/27 06:21:23 genstef Exp $ + + 27 Jul 2007; Stefan Schweizer + -files/acx-0.3.35-2.6.18.patch, +files/acx-0.3.35_p20070101-2.6.22.patch, + -acx-0.3.35.ebuild, acx-0.3.35_p20060521.ebuild, + acx-0.3.35_p20070101.ebuild: + CONFIG_CHECK for WIRELESS_EXT so it also works with 2.6.22 and add a 2.6.22 + patch thanks to Thomas S. Howard in bug 185845 *acx-0.3.35_p20070101 (04 Feb 2007) diff --git a/net-wireless/acx/acx-0.3.35.ebuild b/net-wireless/acx/acx-0.3.35.ebuild deleted file mode 100644 index 1aef06e32d39..000000000000 --- a/net-wireless/acx/acx-0.3.35.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/acx/acx-0.3.35.ebuild,v 1.4 2006/10/20 02:24:29 dsd Exp $ - -inherit linux-mod - -DESCRIPTION="Driver for the ACX100 and ACX111 wireless chipset (CardBus, PCI, USB)" - -HOMEPAGE="http://acx100.sourceforge.net/" -SRC_URI="http://acx100.erley.org/acx-20060215.tar.bz2" - -LICENSE="GPL-2 as-is" -SLOT="0" -KEYWORDS="~amd64 ~ppc x86" - -RDEPEND="net-wireless/wireless-tools - net-wireless/acx-firmware" - -S=${WORKDIR} - -MODULE_NAMES="acx(net:${S})" -CONFIG_CHECK="NET_RADIO FW_LOADER" -BUILD_TARGETS="modules" - -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="-C ${KV_DIR} SUBDIRS=${S}" -} - -src_unpack() { - unpack ${A} - chmod ug+w . -R - sed -i 's:usr/share/acx:lib/firmware:' common.c || die "sed failed" - - # fix 2.6.18 compilation - epatch ${FILESDIR}/${P}-2.6.18.patch -} - -src_install() { - linux-mod_src_install - - dodoc README -} diff --git a/net-wireless/acx/acx-0.3.35_p20060521.ebuild b/net-wireless/acx/acx-0.3.35_p20060521.ebuild index d2b04f14910b..07fdd43263bf 100644 --- a/net-wireless/acx/acx-0.3.35_p20060521.ebuild +++ b/net-wireless/acx/acx-0.3.35_p20060521.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/acx/acx-0.3.35_p20060521.ebuild,v 1.4 2007/07/15 03:28:52 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/acx/acx-0.3.35_p20060521.ebuild,v 1.5 2007/07/27 06:21:23 genstef Exp $ inherit linux-mod @@ -21,7 +21,7 @@ RDEPEND="net-wireless/wireless-tools S=${WORKDIR} MODULE_NAMES="acx(net:${S})" -CONFIG_CHECK="NET_RADIO FW_LOADER" +CONFIG_CHECK="WIRELESS_EXT FW_LOADER" BUILD_TARGETS="modules" pkg_setup() { diff --git a/net-wireless/acx/acx-0.3.35_p20070101.ebuild b/net-wireless/acx/acx-0.3.35_p20070101.ebuild index 8ccc15811bc2..a051a4385cce 100644 --- a/net-wireless/acx/acx-0.3.35_p20070101.ebuild +++ b/net-wireless/acx/acx-0.3.35_p20070101.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/acx/acx-0.3.35_p20070101.ebuild,v 1.2 2007/07/15 03:28:52 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/acx/acx-0.3.35_p20070101.ebuild,v 1.3 2007/07/27 06:21:23 genstef Exp $ inherit linux-mod @@ -22,7 +22,7 @@ RDEPEND="net-wireless/wireless-tools S=${WORKDIR}/${PN}-${PATCHLEVEL} MODULE_NAMES="acx(net:${S})" -CONFIG_CHECK="NET_RADIO FW_LOADER" +CONFIG_CHECK="WIRELESS_EXT FW_LOADER" BUILD_TARGETS="modules" pkg_setup() { @@ -39,6 +39,7 @@ src_unpack() { if ! use debug; then sed -i '/^#define ACX_DEBUG/s/2/0/' acx_config.h || die "Failed to disable debug support" fi + kernel_is ge 2 6 22 && epatch ${FILESDIR}/${P}-2.6.22.patch } diff --git a/net-wireless/acx/files/acx-0.3.35-2.6.18.patch b/net-wireless/acx/files/acx-0.3.35-2.6.18.patch deleted file mode 100644 index 472036b2c0eb..000000000000 --- a/net-wireless/acx/files/acx-0.3.35-2.6.18.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: work/pci.c -=================================================================== ---- work.orig/pci.c -+++ work/pci.c -@@ -50,6 +50,9 @@ - #include - #include - #include -+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17) -+#include -+#endif - - #include "acx.h" - diff --git a/net-wireless/acx/files/acx-0.3.35_p20070101-2.6.22.patch b/net-wireless/acx/files/acx-0.3.35_p20070101-2.6.22.patch new file mode 100644 index 000000000000..5db2a9c3859c --- /dev/null +++ b/net-wireless/acx/files/acx-0.3.35_p20070101-2.6.22.patch @@ -0,0 +1,29 @@ +--- acx-20070101/pci.c.orig 2007-07-24 03:57:41.000000000 -0700 ++++ acx-20070101/pci.c 2007-07-24 03:59:20.000000000 -0700 +@@ -2104,7 +2104,11 @@ + /* TODO: pci_set_power_state(pdev, PCI_D0); ? */ + + /* request shared IRQ handler */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21) ++ if (request_irq(ndev->irq, acxpci_i_interrupt, IRQF_SHARED, ndev->name, ndev)) { ++#else + if (request_irq(ndev->irq, acxpci_i_interrupt, SA_SHIRQ, ndev->name, ndev)) { ++#endif + printk("%s: request_irq FAILED\n", ndev->name); + result = -EAGAIN; + goto done; +--- acx-20070101/common.c.orig 2007-07-24 03:59:40.000000000 -0700 ++++ acx-20070101/common.c 2007-07-24 04:01:23.000000000 -0700 +@@ -2753,8 +2753,11 @@ + + skb->dev = adev->ndev; + skb->dev->last_rx = jiffies; +- ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) ++ skb_reset_mac_header(skb); ++#else + skb->mac.raw = skb->data; ++#endif + skb->ip_summed = CHECKSUM_NONE; + skb->pkt_type = PACKET_OTHERHOST; + skb->protocol = htons(ETH_P_80211_RAW); diff --git a/net-wireless/acx/files/digest-acx-0.3.35 b/net-wireless/acx/files/digest-acx-0.3.35 deleted file mode 100644 index 62ab9f3d5b56..000000000000 --- a/net-wireless/acx/files/digest-acx-0.3.35 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 95bcd5df2365dfcfc78169b0331f69a2 acx-20060215.tar.bz2 145630 -RMD160 40f4871b8aff191cf3decb7a48f2bc1bf9100e99 acx-20060215.tar.bz2 145630 -SHA256 22b5fb7eb833e3168ffcad4d8eae4e778002d892d0dbbf28d27a0fe0a717e19c acx-20060215.tar.bz2 145630 -- cgit v1.2.3-65-gdbad