Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting11.git;a=commitdiff;h=e4557f629b20cbe9796254bc3f4114d13907e4fc
commit e4557f629b20cbe9796254bc3f4114d13907e4fc Author: James Buren <[email protected]> Date: Mon May 13 07:13:06 2013 -0500 ndiswrapper-1.58-1-x86_64 * version bump * rebuild with kernel 3.9 * add patch for kernel 3.9 changes * drop kernel 3.7 patch diff --git a/source/network-extra/ndiswrapper/FrugalBuild b/source/network-extra/ndiswrapper/FrugalBuild index 6e21882..bc2c957 100644 --- a/source/network-extra/ndiswrapper/FrugalBuild +++ b/source/network-extra/ndiswrapper/FrugalBuild @@ -3,18 +3,18 @@ # Maintainer: James Buren <[email protected]> pkgname=ndiswrapper -pkgver=1.58rc1 -pkgrel=20 +pkgver=1.58 +pkgrel=1 pkgdesc="Wrapper for using Windows drivers for some wireless cards" _F_kernelmod_scriptlet=$pkgname.install Finclude kernel-module sourceforge depends=(${depends[@]} 'pciutils' 'wireless_tools') groups=('network-extra') archs=('i686' 'x86_64') -source=("${source[@]}" kernel-3.7.patch ndiswrapper-detect-fix-x86_64.patch README.Frugalware) -sha1sums=('54526ff072f73ff11f1d8d9f9ce92ecd47204cba' \ - 'cc9d71a54caeb773327280afd2ae5ed120a4ea26' \ +source=("${source[@]}" ndiswrapper-detect-fix-x86_64.patch kernel-3.9.patch README.Frugalware) +sha1sums=('a256812b3136648ed93e04146d2276a3ca70957c' \ '7e46cc4bb72520d911f256748e8c3936498f001b' \ + 'a23317e1462fc8d6523eeed4f7e2a4922e15b576' \ 'c3f24143cb9814326a2c0c3cbc8d58d953bac268') build() @@ -22,6 +22,7 @@ build() # no Fcheckkernel, crosscompilation verified export MAKEFLAGS="${MAKEFLAGS} KVERS=\"$_F_kernelmod_uname\"" Fsed "/misc" "/kernel/misc" driver/Makefile + Fsed '$(shell uname -r)' "$_F_kernelmod_uname" driver/Makefile Fbuild Fdoc README.Frugalware Fbuild_kernelmod_scriptlet diff --git a/source/network-extra/ndiswrapper/kernel-3.7.patch b/source/network-extra/ndiswrapper/kernel-3.7.patch deleted file mode 100644 index b56baa9..0000000 --- a/source/network-extra/ndiswrapper/kernel-3.7.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur a/driver/Makefile b/driver/Makefile ---- a/driver/Makefile 2012-04-30 23:54:20.000000000 -0500 -+++ b/driver/Makefile 2012-12-12 17:15:05.891026637 -0600 -@@ -118,6 +118,8 @@ - EXTRA_CFLAGS += -DENABLE_USB - endif - -+WRAP_WQ = 1 -+ - ifdef WRAP_WQ - EXTRA_CFLAGS += -DWRAP_WQ - OBJS += workqueue.o diff --git a/source/network-extra/ndiswrapper/kernel-3.9.patch b/source/network-extra/ndiswrapper/kernel-3.9.patch new file mode 100644 index 0000000..bc6c9a4 --- /dev/null +++ b/source/network-extra/ndiswrapper/kernel-3.9.patch @@ -0,0 +1,24 @@ +diff -ur a/driver/loader.c b/driver/loader.c +--- a/driver/loader.c 2013-02-19 12:00:37.000000000 -0600 ++++ b/driver/loader.c 2013-05-13 07:11:22.292402163 -0500 +@@ -575,7 +575,7 @@ + } else { + printk(KERN_INFO "%s: driver %s (%s) loaded\n", + DRIVER_NAME, wrap_driver->name, wrap_driver->version); +- add_taint(TAINT_PROPRIETARY_MODULE); ++ add_taint(TAINT_PROPRIETARY_MODULE,LOCKDEP_STILL_OK); + EXIT1(return 0); + } + } +diff -ur a/driver/wrapper.c b/driver/wrapper.c +--- a/driver/wrapper.c 2013-02-19 12:00:37.000000000 -0600 ++++ b/driver/wrapper.c 2013-05-13 07:11:05.516402787 -0500 +@@ -72,7 +72,7 @@ + static int __init wrapper_init(void) + { + #ifdef TAINT_OOT_MODULE +- add_taint(TAINT_OOT_MODULE); ++ add_taint(TAINT_OOT_MODULE,LOCKDEP_STILL_OK); + #endif + printk(KERN_INFO "%s version %s loaded (smp=%s, preempt=%s)\n", + DRIVER_NAME, DRIVER_VERSION, _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
