[arch-commits] CVS update of unstable/modules/tiacx (5 files)
Tom Killian
tom at archlinux.org
Sun Oct 14 11:05:45 UTC 2007
Date: Sunday, October 14, 2007 @ 07:05:45
Author: tom
Path: /home/cvs-unstable/unstable/modules/tiacx
Modified: PKGBUILD (1.19 -> 1.20) acx.install (1.10 -> 1.11)
Removed: kernel-2.6.18-19.patch (1.1) kernel-2.6.19.patch (1.1)
kernel-2.6.22.patch (1.1)
upgpkg: tiacx 20071003-1
------------------------+
PKGBUILD | 23 ++++++-------
acx.install | 6 +--
kernel-2.6.18-19.patch | 78 -----------------------------------------------
kernel-2.6.19.patch | 72 -------------------------------------------
kernel-2.6.22.patch | 31 ------------------
5 files changed, 13 insertions(+), 197 deletions(-)
Index: unstable/modules/tiacx/PKGBUILD
diff -u unstable/modules/tiacx/PKGBUILD:1.19 unstable/modules/tiacx/PKGBUILD:1.20
--- unstable/modules/tiacx/PKGBUILD:1.19 Thu Aug 23 03:43:51 2007
+++ unstable/modules/tiacx/PKGBUILD Sun Oct 14 07:05:45 2007
@@ -1,26 +1,23 @@
+# $Id: PKGBUILD,v 1.20 2007/10/14 11:05:45 tom Exp $
# Maintainer: James Rayner <iphitus at gmail.com>
-_kernver=2.6.22-ARCH;
-
pkgname=tiacx
-pkgver=20070101
-pkgrel=5
+pkgver=20071003
+pkgrel=1
pkgdesc="OpenSource module for Texas Instruments ACX100/ACX111 wireless chips. For stock arch 2.6 kernel"
arch=(i686 x86_64)
url="http://acx100.sourceforge.net/"
license=('MPL')
depends=('wireless_tools' 'kernel26' 'tiacx-firmware')
install=acx.install
-source=(http://lisas.de/~andi/acx100/acx-$pkgver.tar.bz2 kernel-2.6.22.patch)
+source=(http://heanet.dl.sourceforge.net/sourceforge/acx100/acx-$pkgver.tar.bz2)
+
+_kernver=2.6.23-ARCH
build() {
- cd $startdir/src/acx-20070101
- patch -Np1 -i ../kernel-2.6.22.patch || return 1
- make -C /lib/modules/$_kernver/build M=`pwd`
- install -D acx.ko $startdir/pkg/lib/modules/$_kernver/extra/acx.ko
+ cd $startdir/src/acx-$pkgver
+ make -C /lib/modules/${_kernver}/build M=`pwd` || return 1
+ install -D acx.ko $startdir/pkg/lib/modules/${_kernver}/extra/acx.ko
sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" $startdir/*.install
}
-md5sums=('ec6322b9c82781897a9433ef0cefda6f'
- 'fb53485b5d8c9b7bdefd870cd25bf51b')
-sha1sums=('5c7259c09bc754529910aceead6087876177a143'
- 'a00449d4165c73e838692b1e0c5e5457f71646f9')
+md5sums=('09cbaa558e1850d4996e7083d8b7bb93')
Index: unstable/modules/tiacx/acx.install
diff -u unstable/modules/tiacx/acx.install:1.10 unstable/modules/tiacx/acx.install:1.11
--- unstable/modules/tiacx/acx.install:1.10 Thu Aug 23 03:43:51 2007
+++ unstable/modules/tiacx/acx.install Sun Oct 14 07:05:45 2007
@@ -1,20 +1,20 @@
# arg 1: the new package version
post_install() {
- KERNEL_VERSION='2.6.22-ARCH'
+ KERNEL_VERSION='2.6.23-ARCH'
depmod -v $KERNEL_VERSION > /dev/null 2>&1
}
# arg 1: the new package version
# arg 2: the old package version
post_upgrade() {
- KERNEL_VERSION='2.6.22-ARCH'
+ KERNEL_VERSION='2.6.23-ARCH'
depmod -v $KERNEL_VERSION > /dev/null 2>&1
}
# arg 1: the old package version
post_remove() {
- KERNEL_VERSION='2.6.22-ARCH'
+ KERNEL_VERSION='2.6.23-ARCH'
depmod -v $KERNEL_VERSION > /dev/null 2>&1
}
Index: unstable/modules/tiacx/kernel-2.6.18-19.patch
diff -u unstable/modules/tiacx/kernel-2.6.18-19.patch:1.1 unstable/modules/tiacx/kernel-2.6.18-19.patch:removed
--- unstable/modules/tiacx/kernel-2.6.18-19.patch:1.1 Mon Jan 1 16:37:28 2007
+++ unstable/modules/tiacx/kernel-2.6.18-19.patch Sun Oct 14 07:05:45 2007
@@ -1,78 +0,0 @@
-diff -ur acx/common.c acx-neu/common.c
---- acx/common.c 2006-02-04 12:18:37.000000000 +0100
-+++ acx-neu/common.c 2006-11-11 12:15:00.000000000 +0100
-@@ -30,7 +30,7 @@
- ** ---------------------------------------------------------------------
- */
-
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/kernel.h>
-diff -ur acx/conv.c acx-neu/conv.c
---- acx/conv.c 2006-02-01 10:49:35.000000000 +0100
-+++ acx-neu/conv.c 2006-11-11 12:15:00.000000000 +0100
-@@ -30,7 +30,7 @@
- ** ---------------------------------------------------------------------
- */
-
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/skbuff.h>
- #include <linux/if_arp.h>
-diff -ur acx/ioctl.c acx-neu/ioctl.c
---- acx/ioctl.c 2006-02-01 10:49:39.000000000 +0100
-+++ acx-neu/ioctl.c 2006-11-11 12:15:00.000000000 +0100
-@@ -30,7 +30,7 @@
- ** ---------------------------------------------------------------------
- */
-
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/kernel.h>
- #include <linux/types.h>
-diff -ur acx/pci.c acx-neu/pci.c
---- acx/pci.c 2006-02-11 13:28:43.000000000 +0100
-+++ acx-neu/pci.c 2006-11-11 12:15:00.000000000 +0100
-@@ -31,8 +31,11 @@
- */
- #define ACX_PCI 1
-
--#include <linux/config.h>
-+
- #include <linux/version.h>
-+#ifndef UTS_RELEASE /* required for Lx 2.6.18 and above */
-+#include <linux/utsrelease.h>
-+#endif
- #include <linux/compiler.h> /* required for Lx 2.6.8 ?? */
- #include <linux/kernel.h>
- #include <linux/module.h>
-diff -ur acx/usb.c acx-neu/usb.c
---- acx/usb.c 2006-02-11 13:28:08.000000000 +0100
-+++ acx-neu/usb.c 2006-11-11 12:15:00.000000000 +0100
-@@ -45,7 +45,7 @@
- #define ACX_USB 1
-
- #include <linux/version.h>
--#include <linux/config.h>
-+
- #include <linux/types.h>
- #include <linux/module.h>
- #include <linux/moduleparam.h>
-diff -ur acx/wlan.c acx-neu/wlan.c
---- acx/wlan.c 2006-02-01 10:49:39.000000000 +0100
-+++ acx-neu/wlan.c 2006-11-11 12:15:00.000000000 +0100
-@@ -37,7 +37,7 @@
- ** http://www.linux-wlan.com
- */
-
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/types.h>
- #include <linux/if_arp.h>
---- pci.c.orig 2006-02-11 12:28:43.000000000 +0000
-+++ pci.c 2006-12-11 10:53:10.000000000 +0000
Index: unstable/modules/tiacx/kernel-2.6.19.patch
diff -u unstable/modules/tiacx/kernel-2.6.19.patch:1.1 unstable/modules/tiacx/kernel-2.6.19.patch:removed
--- unstable/modules/tiacx/kernel-2.6.19.patch:1.1 Fri Dec 1 10:28:44 2006
+++ unstable/modules/tiacx/kernel-2.6.19.patch Sun Oct 14 07:05:45 2007
@@ -1,72 +0,0 @@
-diff -ur acx/common.c acx-neu/common.c
---- acx/common.c 2006-02-04 12:18:37.000000000 +0100
-+++ acx-neu/common.c 2006-11-11 12:15:00.000000000 +0100
-@@ -30,7 +30,7 @@
- ** ---------------------------------------------------------------------
- */
-
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/kernel.h>
-diff -ur acx/conv.c acx-neu/conv.c
---- acx/conv.c 2006-02-01 10:49:35.000000000 +0100
-+++ acx-neu/conv.c 2006-11-11 12:15:00.000000000 +0100
-@@ -30,7 +30,7 @@
- ** ---------------------------------------------------------------------
- */
-
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/skbuff.h>
- #include <linux/if_arp.h>
-diff -ur acx/ioctl.c acx-neu/ioctl.c
---- acx/ioctl.c 2006-02-01 10:49:39.000000000 +0100
-+++ acx-neu/ioctl.c 2006-11-11 12:15:00.000000000 +0100
-@@ -30,7 +30,7 @@
- ** ---------------------------------------------------------------------
- */
-
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/kernel.h>
- #include <linux/types.h>
-diff -ur acx/pci.c acx-neu/pci.c
---- acx/pci.c 2006-02-11 13:28:43.000000000 +0100
-+++ acx-neu/pci.c 2006-11-11 12:15:00.000000000 +0100
-@@ -31,7 +31,7 @@
- */
- #define ACX_PCI 1
-
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/compiler.h> /* required for Lx 2.6.8 ?? */
- #include <linux/kernel.h>
-diff -ur acx/usb.c acx-neu/usb.c
---- acx/usb.c 2006-02-11 13:28:08.000000000 +0100
-+++ acx-neu/usb.c 2006-11-11 12:15:00.000000000 +0100
-@@ -45,7 +45,7 @@
- #define ACX_USB 1
-
- #include <linux/version.h>
--#include <linux/config.h>
-+
- #include <linux/types.h>
- #include <linux/module.h>
- #include <linux/moduleparam.h>
-diff -ur acx/wlan.c acx-neu/wlan.c
---- acx/wlan.c 2006-02-01 10:49:39.000000000 +0100
-+++ acx-neu/wlan.c 2006-11-11 12:15:00.000000000 +0100
-@@ -37,7 +37,7 @@
- ** http://www.linux-wlan.com
- */
-
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/types.h>
- #include <linux/if_arp.h>
Index: unstable/modules/tiacx/kernel-2.6.22.patch
diff -u unstable/modules/tiacx/kernel-2.6.22.patch:1.1 unstable/modules/tiacx/kernel-2.6.22.patch:removed
--- unstable/modules/tiacx/kernel-2.6.22.patch:1.1 Thu Aug 23 03:43:51 2007
+++ unstable/modules/tiacx/kernel-2.6.22.patch Sun Oct 14 07:05:45 2007
@@ -1,31 +0,0 @@
-diff -uNr acx-20070101/common.c acx-20070101-patched/common.c
---- acx-20070101/common.c 2007-01-10 21:15:27.000000000 +0000
-+++ acx-20070101-patched/common.c 2007-08-22 22:55:52.000000000 +0100
-@@ -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 -uNr acx-20070101/pci.c acx-20070101-patched/pci.c
---- acx-20070101/pci.c 2007-01-10 12:27:16.000000000 +0000
-+++ acx-20070101-patched/pci.c 2007-08-22 22:55:52.000000000 +0100
-@@ -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;
More information about the arch-commits
mailing list