[arch-commits] Commit in tiacx/trunk (PKGBUILD acx.install kernel-2.6.30.patch)

[Tobias Powalowski]

    Date: Friday, June 12, 2009 @ 03:20:35
  Author: tpowa
Revision: 42267

upgpkg: tiacx 20080210-10

Added:
  tiacx/trunk/kernel-2.6.30.patch
Modified:
  tiacx/trunk/PKGBUILD
  tiacx/trunk/acx.install

---------------------+
 PKGBUILD            |   13 ++++++-------
 acx.install         |    6 +++---
 kernel-2.6.30.patch |   16 ++++++++++++++++
 3 files changed, 25 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-06-12 07:07:08 UTC (rev 42266)
+++ PKGBUILD	2009-06-12 07:20:35 UTC (rev 42267)
@@ -3,23 +3,22 @@
 
 pkgname=tiacx
 pkgver=20080210
-pkgrel=9
+pkgrel=10
 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>=2.6.29' 'kernel26<2.6.30' 'tiacx-firmware')
+depends=('wireless_tools' 'kernel26>=2.6.30' 'kernel26<2.6.31' 'tiacx-firmware')
 install=acx.install
 source=(http://downloads.sourceforge.net/sourceforge/acx100/acx-$pkgver.tar.bz2
-        kernel-2.6.27.patch)
-md5sums=('7d5ce3215708e4e9f95cf567a9ee3a12'
-         '9895f72f8d0c84956b0f6c3b16df0fe8')
+        kernel-2.6.27.patch
+	kernel-2.6.30.patch)
+_kernver=2.6.30-ARCH
 
-_kernver=2.6.29-ARCH
-
 build() {
     cd $startdir/src/acx-$pkgver
     patch -Np1 -i ../kernel-2.6.27.patch || return 1
+    patch -Np0 -i ../kernel-2.6.30.patch || return 1
     make -C /lib/modules/${_kernver}/build M=`pwd` || return 1
     install -D acx.ko $startdir/pkg/lib/modules/${_kernver}/kernel/drivers/net/wireless/tiacx/acx.ko
     sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" $startdir/*.install

Modified: acx.install
===================================================================
--- acx.install	2009-06-12 07:07:08 UTC (rev 42266)
+++ acx.install	2009-06-12 07:20:35 UTC (rev 42267)
@@ -1,20 +1,20 @@
 # arg 1:  the new package version
 post_install() {
-  KERNEL_VERSION='2.6.29-ARCH'
+  KERNEL_VERSION='2.6.30-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.29-ARCH'
+  KERNEL_VERSION='2.6.30-ARCH'
   depmod -v $KERNEL_VERSION > /dev/null 2>&1	 
   
 }
 
 # arg 1:  the old package version
 post_remove() {
-  KERNEL_VERSION='2.6.29-ARCH'
+  KERNEL_VERSION='2.6.30-ARCH'
   depmod -v $KERNEL_VERSION > /dev/null 2>&1	 
 }
 

Added: kernel-2.6.30.patch
===================================================================
--- kernel-2.6.30.patch	                        (rev 0)
+++ kernel-2.6.30.patch	2009-06-12 07:20:35 UTC (rev 42267)
@@ -0,0 +1,16 @@
+--- wlan_compat.h~	2009-06-12 09:17:30.000000000 +0200
++++ wlan_compat.h	2009-06-12 09:17:30.000000000 +0200
+@@ -217,13 +217,6 @@
+ /*=============================================================*/
+ #define WLAN_PACKED	__attribute__ ((packed))
+ 
+-/* Interrupt handler backwards compatibility stuff */
+-#ifndef IRQ_NONE
+-#define IRQ_NONE
+-#define IRQ_HANDLED
+-typedef void irqreturn_t;
+-#endif
+-
+ #ifndef ARPHRD_IEEE80211_PRISM
+ #define ARPHRD_IEEE80211_PRISM 802
+ #endif