[arch-commits] Commit in ndiswrapper/trunk (PKGBUILD kernel-2.6.31.patch)

[Tobias Powalowski]

    Date: Saturday, February 20, 2010 @ 05:32:22
  Author: tpowa
Revision: 69325

upgpkg: ndiswrapper 1.56-1
bump to latest version

Modified:
  ndiswrapper/trunk/PKGBUILD
Deleted:
  ndiswrapper/trunk/kernel-2.6.31.patch

---------------------+
 PKGBUILD            |   11 ++++-------
 kernel-2.6.31.patch |   20 --------------------
 2 files changed, 4 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-02-20 10:31:26 UTC (rev 69324)
+++ PKGBUILD	2010-02-20 10:32:22 UTC (rev 69325)
@@ -3,8 +3,8 @@
 
 pkgname=ndiswrapper
 _kernver=2.6.32-ARCH
-pkgver=1.55
-pkgrel=4
+pkgver=1.56
+pkgrel=1
 pkgdesc="Module for NDIS (Windows Network Drivers) drivers supplied by vendors. For stock arch 2.6 kernel."
 license=('GPL')
 arch=(i686 x86_64)
@@ -12,13 +12,12 @@
 install="ndiswrapper.install"
 depends=("ndiswrapper-utils=$pkgver" 'kernel26>=2.6.32.3' 'kernel26<2.6.33')
 makedepends=('kernel26-headers>=2.6.32' 'kernel26-headers<2.6.33')
-source=(http://downloads.sourceforge.net/sourceforge/ndiswrapper/ndiswrapper-$pkgver.tar.gz
-        kernel-2.6.31.patch)
+source=(http://downloads.sourceforge.net/sourceforge/ndiswrapper/ndiswrapper-$pkgver.tar.gz)
+md5sums=('1431f7ed5f8e92e752d330bbb3aed333')
 
 build()
 {
   cd $srcdir/ndiswrapper-$pkgver/driver
-  patch -Np1 -i ../../kernel-2.6.31.patch || return 1
   make KVERS=$_kernver || return 1
   make DESTDIR=$pkgdir KVERS=$_kernver install || return 1
   rm $pkgdir/lib/modules/$_kernver/modules.* #wtf?
@@ -30,5 +29,3 @@
   rm -r $pkgdir/lib/modules/$_kernver/misc/
 }
 
-md5sums=('aa423a46aff97bd0a830e43d546f2b0e'
-         '2f2edd27858ee5e64e28a7718acf4b00')

Deleted: kernel-2.6.31.patch
===================================================================
--- kernel-2.6.31.patch	2010-02-20 10:31:26 UTC (rev 69324)
+++ kernel-2.6.31.patch	2010-02-20 10:32:22 UTC (rev 69325)
@@ -1,20 +0,0 @@
---- driver/ntoskernel.h (revision 2701)
-+++ driver/ntoskernel.h (working copy)
-@@ -875,7 +875,7 @@
- #define u64_low_32(x) ((u32)x)
- #define u64_high_32(x) ((u32)(x >> 32))
-
--#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)
-+//#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)
- static inline u64 cmpxchg8b(volatile u64 *ptr, u64 old, u64 new)
- {
-        u64 prev;
-@@ -887,7 +887,7 @@
-                : "A" (old), "b" (u64_low_32(new)), "c" (u64_high_32(new)));
-        return prev;
- }
--#endif
-+//#endif
-
- /* slist routines below update slist atomically - no need for
-  * spinlocks */