[arch-commits] Commit in ndiswrapper/repos (3 files)

Tobias Powalowski tpowa at archlinux.org
Thu Sep 10 15:31:41 UTC 2009


    Date: Thursday, September 10, 2009 @ 11:31:41
  Author: tpowa
Revision: 51722

Merged revisions 51718 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/ndiswrapper/trunk

........
  r51718 | tpowa | 2009-09-10 17:30:11 +0200 (Do, 10 Sep 2009) | 2 lines
  
  upgpkg: ndiswrapper 1.55-2
      bump to new major release
........

Added:
  ndiswrapper/repos/testing-x86_64/kernel-2.6.31.patch
    (from rev 51718, ndiswrapper/trunk/kernel-2.6.31.patch)
Modified:
  ndiswrapper/repos/testing-x86_64/	(properties)
  ndiswrapper/repos/testing-x86_64/PKGBUILD

---------------------+
 PKGBUILD            |    7 +++++--
 kernel-2.6.31.patch |   20 ++++++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)


Property changes on: ndiswrapper/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /ndiswrapper/trunk:1-51666
   + /ndiswrapper/trunk:1-51720

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-09-10 15:31:21 UTC (rev 51721)
+++ testing-x86_64/PKGBUILD	2009-09-10 15:31:41 UTC (rev 51722)
@@ -11,12 +11,13 @@
 url="http://ndiswrapper.sourceforge.net"
 install="ndiswrapper.install"
 depends=("ndiswrapper-utils=$pkgver" 'kernel26>=2.6.31' 'kernel26<2.6.32')
-source=(http://downloads.sourceforge.net/sourceforge/ndiswrapper/ndiswrapper-$pkgver.tar.gz)
-md5sums=('aa423a46aff97bd0a830e43d546f2b0e')
+source=(http://downloads.sourceforge.net/sourceforge/ndiswrapper/ndiswrapper-$pkgver.tar.gz
+        kernel-2.6.31.patch)
 
 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?
@@ -28,3 +29,5 @@
   rm -r $pkgdir/lib/modules/$_kernver/misc/
 }
 
+md5sums=('aa423a46aff97bd0a830e43d546f2b0e'
+         '2f2edd27858ee5e64e28a7718acf4b00')

Copied: ndiswrapper/repos/testing-x86_64/kernel-2.6.31.patch (from rev 51718, ndiswrapper/trunk/kernel-2.6.31.patch)
===================================================================
--- testing-x86_64/kernel-2.6.31.patch	                        (rev 0)
+++ testing-x86_64/kernel-2.6.31.patch	2009-09-10 15:31:41 UTC (rev 51722)
@@ -0,0 +1,20 @@
+--- 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 */




More information about the arch-commits mailing list