Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=f5420b4d4b616e9b93bea185d377e5b84f689073
commit f5420b4d4b616e9b93bea185d377e5b84f689073 Author: James Buren <[email protected]> Date: Wed Oct 26 23:57:31 2011 -0500 acx100-20111027-1-x86_64 * version bump * rebuild with kernel 3.1 * remove old patches diff --git a/source/network-extra/acx100/FrugalBuild b/source/network-extra/acx100/FrugalBuild index dacc916..d81b90a 100644 --- a/source/network-extra/acx100/FrugalBuild +++ b/source/network-extra/acx100/FrugalBuild @@ -2,39 +2,38 @@ # Maintainer: voroskoi <[email protected]> pkgname=acx100 -origname=acx-mac80211 -pkgver=20080806 -pkgrel=48 +pkgver=20111027 +pkgrel=1 pkgdesc="The ACX100/ACX111 wireless network driver." -_F_sourceforge_ext=".tar.bz2" -_F_sourceforge_dirname=${pkgname} -_F_sourceforge_name=${origname} -Finclude kernel-module sourceforge +url="http://acx100.sourceforge.net"; +Finclude kernel-module depends=(${depends[@]} 'wireless_tools') groups=('network-extra') archs=('i686' 'x86_64') -_F_archive_name=${origname} -up2date="Flasttar http://acx100.sourceforge.net/wiki/Main_Page"; -source=(http://ftp.frugalware.org/pub/other/sources/$pkgname/{$origname-$pkgver.tar.bz2,fw.tar.bz2,ACX100_USB.bin,kernel-2.6.27-compat.patch.bz2} kernel-2.6.3{0,1,3}.patch) -signatures=($source.asc '' '' '' '' '' '') +up2date="Flasttar http://ftp.frugalware.org/pub/other/sources/$pkgname"; +source=(http://ftp.frugalware.org/pub/other/sources/$pkgname/{$pkgname-$pkgver.tar.xz,fw.tar.bz2} $pkgname-pci-include.patch) +sha1sums=('094b2c0c3654bc5e63f87dc60349996731102647' \ + '5b5ef1a9d6441f5f8345e1957cd7686e730897f6' \ + 'fdf832c31d7a38a6ecb46e724c34845b309788ef') build() { # no Fcheckkernel, crosscompilation verified - Fcd ${origname}-${pkgver} + Fcd Fpatchall make EXTRA_KCONFIG="CONFIG_ACX_MAC80211=m CONFIG_ACX_MAC80211_PCI=y CONFIG_ACX_MAC80211_USB=y" \ KERNELDIR=/usr/src/linux || Fdie - Fmkdir $_F_kernelmod_dir/net + Fmkdir /lib/firmware Ffilerel $_F_kernelmod_dir/net/acx-mac80211.ko - Ffile /lib/firmware/ACX100_USB.bin - Ffile fw/acx111_1.2.1.34/tiacx111 /lib/firmware - Ffile fw/acx111_2.3.1.31/* /lib/firmware - Ffile fw/acx100_1.9.8.b/* /lib/firmware - Ffile fw/acx100_1.0.9-USB/tiacx100usbc0D /lib/firmware - Ffile fw/acx111_2.4.0.70-USB/tiacx111usbc1B /lib/firmware + Fcp fw/acx111_1.2.1.34/tiacx111 /lib/firmware + Fcp fw/acx111_2.3.1.31/* /lib/firmware + Fcp fw/acx100_1.9.8.b/* /lib/firmware + Fcp fw/acx100_1.0.9-USB/tiacx100usbc0D /lib/firmware + Fcp fw/acx111_2.4.0.70-USB/tiacx111usbc1B /lib/firmware Fln tiacx100usbc0D /lib/firmware/tiacx100usb Fln tiacx111usbc1B /lib/firmware/tiacx111usb Fbuild_kernelmod_scriptlet + Ffileschmod /lib/firmware 0644 + Fdirschmod /lib/firmware 0755 } # optimization OK - uses the kernel's option diff --git a/source/network-extra/acx100/acx100-pci-include.patch b/source/network-extra/acx100/acx100-pci-include.patch new file mode 100644 index 0000000..83f48fd --- /dev/null +++ b/source/network-extra/acx100/acx100-pci-include.patch @@ -0,0 +1,12 @@ +diff -aur a/pci.c b/pci.c +--- a/pci.c 2011-10-26 23:27:18.000000000 -0500 ++++ b/pci.c 2011-10-26 23:52:24.545712991 -0500 +@@ -25,6 +25,8 @@ + #include <generated/utsrelease.h> + #endif + ++#include <linux/interrupt.h> ++#include <linux/hardirq.h> + #include <linux/compiler.h> + #include <linux/kernel.h> + #include <linux/module.h> diff --git a/source/network-extra/acx100/acx100.key b/source/network-extra/acx100/acx100.key deleted file mode 100644 index 1a290d4..0000000 --- a/source/network-extra/acx100/acx100.key +++ /dev/null @@ -1,33 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.9 (GNU/Linux) - -mQGiBERmdGoRBACBy3BuNIj+KDXJR2hR/zAe6T5A6f3EKenC0mXfNa/rJTaEU0kh -c7LJGCnjtxRwKp0CF3PzQPU+P7zFfMTxYUjr1ZtD3VoANkbDbZb5dHIFFb3GDK28 -cvD25EXOyrKgNAkxE9T++8mh8k7jX9THGFNjHD7w3yllw3g1S2ehvXVdIwCgqNAC -gj9sqGmNoBAM5wlK6sldq1MD/2UxZIzq8wkvfFm+t6fxhLoGN+3lHvMkNbjE+lgs -IAkiLvTNpOL303k5AATkh5ljHaxmto+G7aYetA9E6CDRSyzA2izcW2g1H6ZMhi48 -e99oLisPuWG0eiWBJq4D5gwb+hYtg+aEcax7PkwcJLkhqjLd59xfz1WXCsrCEw8m -STBdA/4ua+ux+DxOzd3axskuhtX7m0L3x9RgLzUH/NsOyrvAQHiY7RYjlKyP5jGb -FOxn6J/y3SZfq2wYmwGUrYrre6Cd3a6QBP8cyMmB5Su6pbMBlTrgqfiAMXtroou5 -VavFNCWoUl/197bJuPOEci6dZmNwBg3YOm6OD8bm7xduBceHkLRMRnJ1Z2Fsd2Fy -ZSBMaW51eCBBcmNoaXZlcyBWZXJpZmljYXRpb24gS2V5IDxmcnVnYWx3YXJlLWRl -dmVsQGZydWdhbHdhcmUub3JnPohGBBARAgAGBQJFgocOAAoJEHvNbQIDkVCWigoA -oKqW9DDKI86EsRZuiz88PrAOgtxKAJ9kTZc1Wh8bDioF8JpMytPMuEArw4hGBBAR -AgAGBQJFgu5GAAoJEEFKKfUA6A6GIVcAoJD+Hrojb/+cGVYkQdJpuDcH6BzmAJ92 -q4MzXd6azItLylyAz4OSTPv0MohgBBMRAgAgBQJEZnRqAhsDBgsJCAcDAgQVAggD -BBYCAwECHgECF4AACgkQZ7NElSD1VhlPVwCfRdpRLJc9LCJZNIO5Gn3QaU1xMB0A -n3HWMgzdn8mxkJhyj9J4K37I8aXtuQINBERmdNwQCACrd7e4YTDQSeKhcV3gYgL4 -jKXZKrRhyX3+n3Ycwo7eLNvMSc5gbVYVeAaaovolW7O5ZdhXXUmR6Zc8QMzlQ0L1 -EH/DpFjUnV561kw4WBuE5o5oMiqUjWd3woSUsxFXpoffznzFlwIPqEtAAkooSW5F -JshsRLSu4/Gj2SDqzgjNdDXDnBR/YV51IgYyHFOQSE+vN4yXUjhGI0cZcDPcoafe -jZty0MixVXP4deb3gBpnsK3VgRgM8n0DZL9m2qAHOaXaLxvCrIKacIYlN9SDv4Pn -uNu7F595Xf9qY8x0KLmYEZaSvVC5ZR35YyOxKYexu7g7M1Hyp6UtT81Ctxi9YPL3 -AAMFB/9FQnl6l3FcBvO38lD7q0pkzEnYyqHqlh5N7SQXI4oWmE9SGLXWj5MgUSKy -/05fYTiU6+tX/U5AXQy/+EN9GGEr/kTbfU6NIVOkc2wrXaBkWomlAav5HL18NTF1 -uvjOywyjn3JevJcZ2Bm5l5gaAnWrfcK12udZJyv6b19UpUR195lhU5kT7y4w1hMM -XVjx+R7wamKl533HyEJfaUjZHuejOpA/VX233OFjnUr2iYw5w/s5ey5Z8lrtA5P6 -aXm3QRr23MjztedCovk5yJmzsUd/Fkw0FHGgWPakLMjgBGhyUT2+1yH5XS0rQA2f -Jn0Z7pfdZ2SlrJBVgr/UvLnO+770iEkEGBECAAkFAkRmdNwCGwwACgkQZ7NElSD1 -VhlbxQCfQnid7EXE2DAhyrbmocGa5CzzNzkAoIgE96QvLqESutC/tuk6j2q5msud -=kCh9 ------END PGP PUBLIC KEY BLOCK----- diff --git a/source/network-extra/acx100/kernel-2.6.30.patch b/source/network-extra/acx100/kernel-2.6.30.patch deleted file mode 100644 index 1fb46ff..0000000 --- a/source/network-extra/acx100/kernel-2.6.30.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- ./wlan_compat.h.orig 2009-06-12 22:16:16.000000000 +0200 -+++ ./wlan_compat.h 2009-06-12 22:17:10.000000000 +0200 -@@ -222,11 +222,13 @@ - #define WLAN_PACKED __attribute__ ((packed)) - - /* Interrupt handler backwards compatibility stuff */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29) - #ifndef IRQ_NONE - #define IRQ_NONE - #define IRQ_HANDLED - typedef void irqreturn_t; - #endif -+#endif - - #ifndef ARPHRD_IEEE80211_PRISM - #define ARPHRD_IEEE80211_PRISM 802 diff --git a/source/network-extra/acx100/kernel-2.6.31.patch b/source/network-extra/acx100/kernel-2.6.31.patch deleted file mode 100644 index 0321a43..0000000 --- a/source/network-extra/acx100/kernel-2.6.31.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff --git a/pci.c b/pci.c -index 985a7b3..af76968 100644 ---- a/pci.c -+++ b/pci.c -@@ -1503,6 +1503,17 @@ IO_ACX111[] = - static void - dummy_netdev_init(struct net_device *ndev) {} - -+static const struct net_device_ops acx_net_device_ops = -+{ -+ .ndo_open = acxpci_e_open, -+ .ndo_stop = acxpci_e_close, -+ .ndo_start_xmit = acx_i_start_xmit, -+ .ndo_get_stats = acx_e_get_stats, -+ .ndo_set_multicast_list = acxpci_i_set_multicast_list, -+ .ndo_tx_timeout = acxpci_i_tx_timeout, -+ .ndo_change_mtu = acx_e_change_mtu, -+}; -+ - static int __devinit - acxpci_e_probe(struct pci_dev *pdev, const struct pci_device_id *id) - { -@@ -1613,17 +1624,11 @@ acxpci_e_probe(struct pci_dev *pdev, const struct pci_device_id *id) - } - - ether_setup(ndev); -- ndev->open = &acxpci_e_open; -- ndev->stop = &acxpci_e_close; -- ndev->hard_start_xmit = &acx_i_start_xmit; -- ndev->get_stats = &acx_e_get_stats; -+ ndev->netdev_ops = &acx_net_device_ops; - #if IW_HANDLER_VERSION <= 5 - ndev->get_wireless_stats = &acx_e_get_wireless_stats; - #endif - ndev->wireless_handlers = (struct iw_handler_def *)&acx_ioctl_handler_def; -- ndev->set_multicast_list = &acxpci_i_set_multicast_list; -- ndev->tx_timeout = &acxpci_i_tx_timeout; -- ndev->change_mtu = &acx_e_change_mtu; - ndev->watchdog_timeo = 4 * HZ; - ndev->irq = pdev->irq; - ndev->base_addr = pci_resource_start(pdev, 0); -diff --git a/usb.c b/usb.c -index be1d13b..bde3476 100644 ---- a/usb.c -+++ b/usb.c -@@ -617,6 +617,17 @@ acxusb_s_fill_configoption(acx_device_t *adev) - static void - dummy_netdev_init(struct net_device *ndev) {} - -+static const struct net_device_ops acx_net_device_ops = -+{ -+ .ndo_open = acxusb_e_open, -+ .ndo_stop = acxusb_e_close, -+ .ndo_start_xmit = acx_i_start_xmit, -+ .ndo_get_stats = acx_e_get_stats, -+ .ndo_set_multicast_list = acxusb_i_set_rx_mode, -+ .ndo_tx_timeout = acxusb_i_tx_timeout, -+ .ndo_change_mtu = acx_e_change_mtu, -+}; -+ - static int - acxusb_e_probe(struct usb_interface *intf, const struct usb_device_id *devID) - { -@@ -671,16 +682,10 @@ acxusb_e_probe(struct usb_interface *intf, const struct usb_device_id *devID) - /* Register the callbacks for the network device functions */ - - ether_setup(ndev); -- ndev->open = &acxusb_e_open; -- ndev->stop = &acxusb_e_close; -- ndev->hard_start_xmit = (void *)&acx_i_start_xmit; -- ndev->get_stats = (void *)&acx_e_get_stats; -- ndev->set_multicast_list = (void *)&acxusb_i_set_rx_mode; -+ ndev->netdev_ops = &acx_net_device_ops; - #ifdef HAVE_TX_TIMEOUT -- ndev->tx_timeout = &acxusb_i_tx_timeout; - ndev->watchdog_timeo = 4 * HZ; - #endif -- ndev->change_mtu = &acx_e_change_mtu; - - /* Setup private driver context */ - diff --git a/source/network-extra/acx100/kernel-2.6.33.patch b/source/network-extra/acx100/kernel-2.6.33.patch deleted file mode 100644 index 36eb386..0000000 --- a/source/network-extra/acx100/kernel-2.6.33.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/pci.c b/pci.c -index af76968..0bb678e 100644 ---- a/pci.c -+++ b/pci.c -@@ -31,7 +31,7 @@ - */ - #define ACX_PCI 1 - --#include <linux/utsrelease.h> -+#include <generated/utsrelease.h> - #include <linux/version.h> - #include <linux/kernel.h> - #include <linux/module.h> -diff --git a/usb.c b/usb.c -index bde3476..e7edd1a 100644 ---- a/usb.c -+++ b/usb.c -@@ -45,7 +45,7 @@ - #define ACX_USB 1 - - #include <linux/version.h> --#include <linux/utsrelease.h> -+#include <generated/utsrelease.h> - #include <linux/types.h> - #include <linux/module.h> - #include <linux/moduleparam.h> _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
