Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=e41b5ffead0bba4c9ff337cb3b3d27c6eedfd2e4
commit e41b5ffead0bba4c9ff337cb3b3d27c6eedfd2e4
Author: Miklos Vajna <vmik...@frugalware.org>
Date: Sat Mar 13 18:01:54 2010 +0100
ndiswrapper-1.55-10-i686
- add kernel-2.6.33.patch
diff --git a/source/network/ndiswrapper/FrugalBuild
b/source/network/ndiswrapper/FrugalBuild
index 958450f..9933dbe 100644
--- a/source/network/ndiswrapper/FrugalBuild
+++ b/source/network/ndiswrapper/FrugalBuild
@@ -4,7 +4,7 @@
pkgname=ndiswrapper
pkgver=1.55
-pkgrel=9
+pkgrel=10
pkgdesc="Wrapper for using Windows drivers for some wireless cards"
_F_kernelmod_scriptlet=$pkgname.install
Finclude kernel-module sourceforge
@@ -12,11 +12,12 @@ depends=(${depen...@]} 'pciutils' 'wireless_tools')
groups=('network')
archs=('i686' 'x86_64')
source=(${sour...@]} README.Frugalware ndiswrapper-detect-fix-x86_64.patch \
- kernel-2.6.31.patch)
+ kernel-2.6.3{1,3}.patch)
sha1sums=('84f7b08347f09df109722dccfdf18cf439fbc3be' \
'c3f24143cb9814326a2c0c3cbc8d58d953bac268' \
'7e46cc4bb72520d911f256748e8c3936498f001b' \
- '01f0509efd3e9efd38746ed07e39cb691708dadb')
+ '01f0509efd3e9efd38746ed07e39cb691708dadb' \
+ '5c559abf3b01822522401e1375b02192d0535e36')
build()
{
diff --git a/source/network/ndiswrapper/kernel-2.6.33.patch
b/source/network/ndiswrapper/kernel-2.6.33.patch
new file mode 100644
index 0000000..03f7691
--- /dev/null
+++ b/source/network/ndiswrapper/kernel-2.6.33.patch
@@ -0,0 +1,26 @@
+diff --git a/driver/Makefile b/driver/Makefile
+index 5e53055..3780bf9 100644
+--- a/driver/Makefile
++++ b/driver/Makefile
+@@ -26,7 +26,7 @@ endif
+ # Kernel Makefile doesn't always know the exact kernel version, so we
+ # get it from the kernel headers instead and pass it to make.
+
+-VERSION_H := $(KBUILD)/include/linux/utsrelease.h
++VERSION_H := $(KBUILD)/include/generated/utsrelease.h
+ ifeq (,$(wildcard $(VERSION_H)))
+ VERSION_H := $(KBUILD)/include/linux/version.h
+ endif
+diff --git a/driver/ntoskernel.h b/driver/ntoskernel.h
+index db9d209..35bf68c 100644
+--- a/driver/ntoskernel.h
++++ b/driver/ntoskernel.h
+@@ -875,7 +875,7 @@ static inline struct nt_slist
*PopEntrySList(nt_slist_header *head,
+ #define u64_low_32(x) ((u32)x)
+ #define u64_high_32(x) ((u32)(x >> 32))
+
+-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,32)
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,33)
+ static inline u64 cmpxchg8b(volatile u64 *ptr, u64 old, u64 new)
+ {
+ u64 prev;
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
