[arch-commits] CVS update of extra/network/zd1211-suspend2 (4 files)

Jan de Groot jgc at archlinux.org
Fri Jun 1 11:45:40 UTC 2007


    Date: Friday, June 1, 2007 @ 07:45:40
  Author: jgc
    Path: /home/cvs-extra/extra/network/zd1211-suspend2

 Removed: PKGBUILD (1.3) kernel-2.6.19.patch (1.1) kernel-2.6.20.patch (1.1)
          zd1211.install (1.2)

Remove, integrated in kernel since 2.6.18


---------------------+
 PKGBUILD            |   37 -------------------------------------
 kernel-2.6.19.patch |   48 ------------------------------------------------
 kernel-2.6.20.patch |   13 -------------
 zd1211.install      |   36 ------------------------------------
 4 files changed, 134 deletions(-)


Index: extra/network/zd1211-suspend2/PKGBUILD
diff -u extra/network/zd1211-suspend2/PKGBUILD:1.3 extra/network/zd1211-suspend2/PKGBUILD:removed
--- extra/network/zd1211-suspend2/PKGBUILD:1.3	Wed May 16 05:50:27 2007
+++ extra/network/zd1211-suspend2/PKGBUILD	Fri Jun  1 07:45:40 2007
@@ -1,37 +0,0 @@
-#$Id: PKGBUILD,v 1.3 2007/05/16 09:50:27 daniel Exp $
-# Maintainer: James Rayner <james at archlinux.org>
-#Contributor: linfocito <dududa - gmail com>
-pkgname=zd1211-suspend2
-pkgver=r83
-pkgrel=2
-pkgdesc="Drivers for ZyDAS ZD1211 and ZD1211b USB wireless lan chipsets."
-url="http://zd1211.ath.cx"
-license="GPL"
-depends=(kernel26suspend2)
-install=zd1211.install
-source=(http://zd1211.ath.cx/download/zd1211-driver-$pkgver.tgz kernel-2.6.19.patch
-        kernel-2.6.20.patch)
-md5sums=('a5751f0e6f1f368689077fa7758a4932' '6cac79544f2bed3a86b0c3d260f30d16'\
-         '3d7f2f28d91fa67a57ac663d528e6465')
-_kernver=2.6.21-suspend2
-arch=('i686' 'x86_64')
-
-build() {
-  
-  cd $startdir/src/zd1211-driver-$pkgver
-  patch -Np0 -i ../kernel-2.6.19.patch || return 1
-  patch -Np1 -i ../kernel-2.6.20.patch || return 1
-  sed -i "s|^KERNEL_|##KERNEL_|" Makefile
-  sed -i "s|#KERNEL_|KERNEL_|" Makefile
-  sed -i "s|linux$|linux-$_kernver|" Makefile
-  
-  make VERSION=${_kernver} ZD1211REV_B=0
-  mkdir -p $startdir/pkg/lib/modules/$_kernver/kernel/drivers/net/wireless
-  install -m644 zd1211.ko $startdir/pkg/lib/modules/$_kernver/kernel/drivers/net/wireless/
-
-  make clean
-
-  make VERSION=${_kernver} ZD1211REV_B=1
-  install -m644 zd1211b.ko $startdir/pkg/lib/modules/$_kernver/kernel/drivers/net/wireless/
-  sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" $startdir/*.install
-}
Index: extra/network/zd1211-suspend2/kernel-2.6.19.patch
diff -u extra/network/zd1211-suspend2/kernel-2.6.19.patch:1.1 extra/network/zd1211-suspend2/kernel-2.6.19.patch:removed
--- extra/network/zd1211-suspend2/kernel-2.6.19.patch:1.1	Sat Dec 16 20:23:46 2006
+++ extra/network/zd1211-suspend2/kernel-2.6.19.patch	Fri Jun  1 07:45:40 2007
@@ -1,48 +0,0 @@
---- src/zd1211.c~	2006-06-16 12:35:59.000000000 +0200
-+++ src/zd1211.c	2006-10-17 20:26:03.000000000 +0200
-@@ -30,7 +30,6 @@
- *
- * -------------------------------------------------------------------- */
- 
--#include <linux/config.h>
- #include <net/checksum.h>
- #include <linux/tcp.h>
- #include <linux/udp.h>
---- src/zd1205.c~	2006-07-09 11:55:08.000000000 +0200
-+++ src/zd1205.c	2006-10-17 20:25:39.000000000 +0200
-@@ -31,7 +31,6 @@
- * -------------------------------------------------------------------- */
- #define __KERNEL_SYSCALLS__
- 
--#include <linux/config.h>
- #include <net/checksum.h>
- #include <linux/tcp.h>
- #include <linux/udp.h>
---- src/zd1205_proc.c~	2006-02-13 13:50:12.000000000 +0100
-+++ src/zd1205_proc.c	2006-10-17 20:25:51.000000000 +0200
-@@ -30,7 +30,6 @@
- *
- * -------------------------------------------------------------------- */
- 
--#include <linux/config.h>
- 
- #ifdef CONFIG_PROC_FS
- #include "zd1205.h"
---- src/zd1211.c~	2006-06-16 12:35:59.000000000 +0200
-+++ src/zd1211.c	2006-11-18 11:16:06.000000000 +0100
-@@ -1880,7 +1880,6 @@
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
-         /* ath_desc: added iw_get_stats */
-         /* ath: using p80211wext_handler_def.get_wireless_stats in 2.6.10+ */
--        dev->get_wireless_stats = &zd1205wext_iw_get_stats;
- #endif
- #endif
- 
-@@ -1889,7 +1888,6 @@
-         dev->get_stats = zd1205_get_stats;
- #if ZDCONF_WE_STAT_SUPPORT == 1
- 
--        dev->get_wireless_stats = zd1205_iw_getstats;
- #elif !defined(ZDCONF_WE_STAT_SUPPORT)
- 	#error "Undefine ZDCONF_WE_STAT_SUPPORT"
- #endif
Index: extra/network/zd1211-suspend2/kernel-2.6.20.patch
diff -u extra/network/zd1211-suspend2/kernel-2.6.20.patch:1.1 extra/network/zd1211-suspend2/kernel-2.6.20.patch:removed
--- extra/network/zd1211-suspend2/kernel-2.6.20.patch:1.1	Tue May  8 17:48:20 2007
+++ extra/network/zd1211-suspend2/kernel-2.6.20.patch	Fri Jun  1 07:45:40 2007
@@ -1,13 +0,0 @@
---- zd1211-driver-r83/src/zd1211.c~	2006-06-16 12:35:59.000000000 +0200
-+++ zd1211-driver-r83/src/zd1211.c	2007-02-04 23:23:53.000000000 +0100
-@@ -1801,8 +1801,8 @@
-         spin_lock_init(&(macp->q_lock));
-         spin_lock_init(&(macp->cs_lock));
- 
--        INIT_WORK(&macp->kevent, kevent, macp);
--        INIT_WORK(&macp->scan_tout_event, kevent, macp);
-+        INIT_WORK(&macp->kevent, kevent);
-+        INIT_WORK(&macp->scan_tout_event, kevent);
- 
-         macp->numTcb = NUM_TCB;
-         macp->numTbd = NUM_TBD;
Index: extra/network/zd1211-suspend2/zd1211.install
diff -u extra/network/zd1211-suspend2/zd1211.install:1.2 extra/network/zd1211-suspend2/zd1211.install:removed
--- extra/network/zd1211-suspend2/zd1211.install:1.2	Tue May  8 17:48:20 2007
+++ extra/network/zd1211-suspend2/zd1211.install	Fri Jun  1 07:45:40 2007
@@ -1,36 +0,0 @@
-# arg 1:  the new package version
-post_install()
-{
-  KERNEL_VERSION='2.6.21-suspend2'
-  depmod -v $KERNEL_VERSION > /dev/null 2>&1 
-  /bin/true
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade()
-{
-  KERNEL_VERSION='2.6.21-suspend2'
-  depmod -v $KERNEL_VERSION > /dev/null 2>&1 
-  /bin/true
-}
-
-# arg 1:  the old package version
-pre_remove()
-{
-  /bin/true
-}
-
-# arg 1:  the old package version
-post_remove()
-{
-  KERNEL_VERSION='2.6.21-suspend2'
-  depmod -v $KERNEL_VERSION > /dev/null 2>&1 	 
- 
-  /bin/true
-}
-
-op=$1
-shift
-
-$op $*




More information about the arch-commits mailing list