rpms/west-chamber-kmod/F-17 west-chamber-kmod.spec,1.56,1.57
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/west-chamber-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28910
Modified Files:
west-chamber-kmod.spec
Log Message:
* Sat Jan 19 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.1-7.20101017svn.48
- Rebuilt for updated kernel
Index: west-chamber-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/west-chamber-kmod/F-17/west-chamber-kmod.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- west-chamber-kmod.spec 17 Jan 2013 09:24:06 -0000 1.56
+++ west-chamber-kmod.spec 19 Jan 2013 23:44:27 -0000 1.57
@@ -11,7 +11,7 @@
Name: west-chamber-kmod
Summary: Kernel module (kmod) for west-chamber
Version: 0.0.1
-Release: 7.%{?svndate}svn%{?dist}.47
+Release: 7.%{?svndate}svn%{?dist}.48
License: GPLv2+
Group: System Environment/Kernel
URL: http://code.google.com/p/scholarzhang/
@@ -82,6 +82,9 @@
rm -rf %{buildroot}
%changelog
+* Sat Jan 19 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.1-7.20101017svn.48
+- Rebuilt for updated kernel
+
* Thu Jan 17 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.1-7.20101017svn.47
- Rebuilt for updated kernel
11 years, 3 months
rpms/VirtualBox-kmod/F-17 VirtualBox-kmod.spec,1.44,1.45
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/VirtualBox-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28789
Modified Files:
VirtualBox-kmod.spec
Log Message:
* Sat Jan 19 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 4.2.6-1.3
- Rebuilt for updated kernel
Index: VirtualBox-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-kmod/F-17/VirtualBox-kmod.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- VirtualBox-kmod.spec 17 Jan 2013 09:23:57 -0000 1.44
+++ VirtualBox-kmod.spec 19 Jan 2013 23:44:19 -0000 1.45
@@ -20,7 +20,7 @@
Name: VirtualBox-kmod
Version: 4.2.6
-Release: 1%{?prerel:.%{prerel}}%{?dist}.2
+Release: 1%{?prerel:.%{prerel}}%{?dist}.3
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -98,6 +98,9 @@
%changelog
+* Sat Jan 19 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 4.2.6-1.3
+- Rebuilt for updated kernel
+
* Thu Jan 17 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 4.2.6-1.2
- Rebuilt for updated kernel
11 years, 3 months
rpms/staging-kmod/F-17 staging-kmod.spec,1.72,1.73
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/staging-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28663
Modified Files:
staging-kmod.spec
Log Message:
* Sat Jan 19 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 3.6.1-1.16
- Rebuilt for updated kernel
Index: staging-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-17/staging-kmod.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- staging-kmod.spec 17 Jan 2013 09:23:45 -0000 1.72
+++ staging-kmod.spec 19 Jan 2013 23:44:10 -0000 1.73
@@ -20,7 +20,7 @@
Name: staging-kmod
Version: 3.6.1
-Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.15
+Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.16
Summary: Selected kernel modules from linux-staging
Group: System Environment/Kernel
@@ -136,6 +136,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Jan 19 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 3.6.1-1.16
+- Rebuilt for updated kernel
+
* Thu Jan 17 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 3.6.1-1.15
- Rebuilt for updated kernel
11 years, 3 months
rpms/openafs-kmod/F-17 openafs-kmod.spec,1.64,1.65
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/openafs-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28542
Modified Files:
openafs-kmod.spec
Log Message:
* Sat Jan 19 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-4.15
- Rebuilt for updated kernel
Index: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-17/openafs-kmod.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- openafs-kmod.spec 17 Jan 2013 09:23:35 -0000 1.64
+++ openafs-kmod.spec 19 Jan 2013 23:44:02 -0000 1.65
@@ -21,7 +21,7 @@
Name: %{kmod_name}-kmod
Version: 1.6.1
-Release: 4%{?dist}.14
+Release: 4%{?dist}.15
Summary: Kernel module(s)
Group: System Environment/Kernel
@@ -147,6 +147,9 @@
%changelog
+* Sat Jan 19 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-4.15
+- Rebuilt for updated kernel
+
* Thu Jan 17 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-4.14
- Rebuilt for updated kernel
11 years, 3 months
rpms/ndiswrapper-kmod/F-17 ndiswrapper-kmod.spec,1.101,1.102
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ndiswrapper-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28414
Modified Files:
ndiswrapper-kmod.spec
Log Message:
* Sat Jan 19 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.57-3.1
- Rebuilt for updated kernel
Index: ndiswrapper-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/ndiswrapper-kmod/F-17/ndiswrapper-kmod.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- ndiswrapper-kmod.spec 19 Jan 2013 23:16:32 -0000 1.101
+++ ndiswrapper-kmod.spec 19 Jan 2013 23:43:53 -0000 1.102
@@ -3,14 +3,14 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels current
+%define buildforkernels newest
#global _rc rc1
Summary: Ndiswrapper kernel module
Name: ndiswrapper-kmod
Version: 1.57
-Release: 3%{?dist}
+Release: 3%{?dist}.1
License: GPLv2
Group: System Environment/Kernel
URL: http://ndiswrapper.sourceforge.net
@@ -77,6 +77,9 @@
%changelog
+* Sat Jan 19 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.57-3.1
+- Rebuilt for updated kernel
+
* Sat Jan 19 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1.57-3
- patch for 3.7 kernel
11 years, 3 months
rpms/buildsys-build-rpmfusion/F-17 buildsys-build-rpmfusion-kerneldevpkgs-current, 1.69, 1.70 buildsys-build-rpmfusion.spec, 1.83, 1.84
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/buildsys-build-rpmfusion/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27953
Modified Files:
buildsys-build-rpmfusion-kerneldevpkgs-current
buildsys-build-rpmfusion.spec
Log Message:
* Sat Jan 19 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 10:17-39
- rebuild for kernel 3.7.3-101.fc17
Index: buildsys-build-rpmfusion-kerneldevpkgs-current
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-17/buildsys-build-rpmfusion-kerneldevpkgs-current,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- buildsys-build-rpmfusion-kerneldevpkgs-current 17 Jan 2013 08:44:59 -0000 1.69
+++ buildsys-build-rpmfusion-kerneldevpkgs-current 19 Jan 2013 23:31:28 -0000 1.70
@@ -1,3 +1,3 @@
-3.6.11-8.fc17
-3.6.11-8.fc17smp
-3.6.11-8.fc17PAE
+3.7.3-101.fc17
+3.7.3-101.fc17smp
+3.7.3-101.fc17PAE
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-17/buildsys-build-rpmfusion.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- buildsys-build-rpmfusion.spec 17 Jan 2013 08:44:59 -0000 1.83
+++ buildsys-build-rpmfusion.spec 19 Jan 2013 23:31:28 -0000 1.84
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 17
-Release: 38
+Release: 39
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -86,6 +86,9 @@
%changelog
+* Sat Jan 19 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 10:17-39
+- rebuild for kernel 3.7.3-101.fc17
+
* Thu Jan 17 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 10:17-38
- rebuild for kernel 3.6.11-8.fc17
11 years, 3 months
rpms/xorg-x11-drv-nvidia-173xx/F-17 sources, 1.10, 1.11 xorg-x11-drv-nvidia-173xx.spec, 1.25, 1.26
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27578
Modified Files:
sources xorg-x11-drv-nvidia-173xx.spec
Log Message:
* Sat Jan 19 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 173.14.36-1
- Update to 173.14.36
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-17/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 5 Jun 2012 21:11:26 -0000 1.10
+++ sources 19 Jan 2013 23:20:38 -0000 1.11
@@ -1,2 +1,2 @@
-0fa45e6fc23a2dc69faa8a66ae0e0cc5 NVIDIA-Linux-x86-173.14.35-pkg0.run
-6934b522d2cf313ae6e94e25763fe1a8 NVIDIA-Linux-x86_64-173.14.35-pkg0.run
+513677824e9684dd34ca17ad56a68500 NVIDIA-Linux-x86-173.14.36-pkg0.run
+c341612429c2885980103b40542cb2b2 NVIDIA-Linux-x86_64-173.14.36-pkg0.run
Index: xorg-x11-drv-nvidia-173xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-17/xorg-x11-drv-nvidia-173xx.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xorg-x11-drv-nvidia-173xx.spec 8 Nov 2012 20:49:38 -0000 1.25
+++ xorg-x11-drv-nvidia-173xx.spec 19 Jan 2013 23:20:38 -0000 1.26
@@ -4,8 +4,8 @@
%global __strip /bin/true
Name: xorg-x11-drv-nvidia-173xx
-Version: 173.14.35
-Release: 2%{?dist}
+Version: 173.14.36
+Release: 1%{?dist}
Summary: NVIDIA's 173xx serie proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -327,6 +327,9 @@
%changelog
+* Sat Jan 19 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 173.14.36-1
+- Update to 173.14.36
+
* Thu Nov 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.35-2
- Fix posttrans error code
11 years, 3 months
rpms/ndiswrapper-kmod/F-17 ndiswrapper-kmod.spec, 1.100, 1.101 ndiswrapper_3.3_kernel.patch, 1.3, 1.4
by Leigh Scott
Author: leigh123linux
Update of /cvs/free/rpms/ndiswrapper-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27394
Modified Files:
ndiswrapper-kmod.spec ndiswrapper_3.3_kernel.patch
Log Message:
* Sat Jan 19 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1.57-3
- patch for 3.7 kernel
Index: ndiswrapper-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/ndiswrapper-kmod/F-17/ndiswrapper-kmod.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- ndiswrapper-kmod.spec 17 Jan 2013 09:23:26 -0000 1.100
+++ ndiswrapper-kmod.spec 19 Jan 2013 23:16:32 -0000 1.101
@@ -3,14 +3,14 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+%define buildforkernels current
#global _rc rc1
Summary: Ndiswrapper kernel module
Name: ndiswrapper-kmod
Version: 1.57
-Release: 2%{?dist}.44
+Release: 3%{?dist}
License: GPLv2
Group: System Environment/Kernel
URL: http://ndiswrapper.sourceforge.net
@@ -77,6 +77,9 @@
%changelog
+* Sat Jan 19 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1.57-3
+- patch for 3.7 kernel
+
* Thu Jan 17 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.57-2.44
- Rebuilt for updated kernel
ndiswrapper_3.3_kernel.patch:
Makefile | 5 ++++-
iw_ndis.c | 4 ++++
ndis.c | 6 ++++++
ntoskernel.h | 17 ++++-------------
wrapndis.c | 4 ++++
5 files changed, 22 insertions(+), 14 deletions(-)
Index: ndiswrapper_3.3_kernel.patch
===================================================================
RCS file: /cvs/free/rpms/ndiswrapper-kmod/F-17/ndiswrapper_3.3_kernel.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ndiswrapper_3.3_kernel.patch 30 Mar 2012 15:43:21 -0000 1.3
+++ ndiswrapper_3.3_kernel.patch 19 Jan 2013 23:16:32 -0000 1.4
@@ -1,3 +1,75 @@
+Description: version.h is in a different location for 3.7
+Author: Dmitrijs Ledkovs <dmitrij.ledkov(a)ubuntu.com>
+
+--- a/driver/Makefile
++++ b/driver/Makefile
+@@ -123,6 +123,9 @@
+ OBJS += workqueue.o
+ endif
+
++ifneq (,$(wildcard $(KBUILD)/include/generated/uapi/linux/version.h))
++EXTRA_CFLAGS += -DUAPI
++endif
+
+ all: config_check modules
+
+@@ -157,7 +160,7 @@
+
+
+ config_check:
+- @if [ ! -f $(KBUILD)/include/linux/version.h ]; then \
++ @if [ ! -f $(KBUILD)/include/linux/version.h ] && [ ! -f $(KBUILD)/include/generated/uapi/linux/version.h ]; then \
+ echo; echo; \
+ echo "Cannot find kernel build files in $(KBUILD)"; \
+ echo "Please give the path to kernel build directory with" ; \
+--- a/driver/ntoskernel.h
++++ b/driver/ntoskernel.h
+@@ -36,7 +36,11 @@
+ #include <linux/usb.h>
+ #include <linux/spinlock.h>
+ #include <asm/mman.h>
++#ifdef UAPI
++#include <generated/uapi/linux/version.h>
++#else
+ #include <linux/version.h>
++#endif
+ #include <linux/etherdevice.h>
+ #include <net/iw_handler.h>
+ #include <linux/ethtool.h>
+@@ -204,19 +208,6 @@
+ void wrap_cancel_work(struct work_struct *work);
+ void wrap_flush_wq(struct workqueue_struct *workq);
+
+-#else // WRAP_WQ
+-
+-/* Compatibility for Linux before 2.6.20 where INIT_WORK takes 3 arguments */
+-#if !defined(INIT_WORK_NAR) && !defined(INIT_DELAYED_WORK_DEFERRABLE)
+-typedef void (*compat_work_func_t)(void *work);
+-typedef void (*work_func_t)(struct work_struct *work);
+-static inline void (INIT_WORK)(struct work_struct *work, work_func_t func)
+-{
+- INIT_WORK(work, (compat_work_func_t)func, work);
+-}
+-#undef INIT_WORK
+-#endif
+-
+ #endif // WRAP_WQ
+
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18)
+--- a/driver/iw_ndis.c
++++ b/driver/iw_ndis.c
+@@ -13,7 +13,11 @@
+ *
+ */
+
++#ifdef UAPI
++#include <generated/uapi/linux/version.h>
++#else
+ #include <linux/version.h>
++#endif
+ #include <linux/wireless.h>
+ #include <linux/netdevice.h>
+ #include <linux/etherdevice.h>
--- a/driver/wrapndis.c 2012/03/26 17:00:31 3107
+++ b/driver/wrapndis.c 2012/03/26 17:01:18 3108
@@ -1675,6 +1675,7 @@
11 years, 3 months
rpms/nvidia-kmod/F-17 3.7_kernel.patch, NONE, 1.1 nvidia-kmod.spec, 1.151, 1.152
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27178
Modified Files:
nvidia-kmod.spec
Added Files:
3.7_kernel.patch
Log Message:
* Sat Jan 19 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:304.64-2
- patch for 3.7 kernel
3.7_kernel.patch:
conftest.sh | 7 ++++++-
nv-mmap.c | 4 ++++
2 files changed, 10 insertions(+), 1 deletion(-)
--- NEW FILE 3.7_kernel.patch ---
--- a/kernel/conftest.sh
+++ b/kernel/conftest.sh
@@ -127,6 +127,7 @@ build_cflags() {
if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
+ MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/arch/x86/include/uapi"
elif [ "$ARCH" = "arm" ]; then
MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/arm/mach-tegra/include -D__LINUX_ARM_ARCH__=7"
fi
@@ -138,6 +139,7 @@ build_cflags() {
if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
+ MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/arch/x86/include/uapi"
elif [ "$ARCH" = "arm" ]; then
MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/arm/mach-tegra/include -D__LINUX_ARM_ARCH__=7"
fi
@@ -147,9 +149,12 @@ build_cflags() {
fi
CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
+ CFLAGS="$CFLAGS -I$HEADERS -I$HEADERS/uapi"
if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
- CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$OUTPUT/arch/x86/include/generated"
+ CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include"
+ CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated"
+ CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated/uapi"
elif [ "$ARCH" = "arm" ]; then
CFLAGS="$CFLAGS -I$SOURCES/arch/arm/include -I$OUTPUT/arch/arm/include/generated"
fi
--- a/kernel/nv-mmap.c
+++ b/kernel/nv-mmap.c
@@ -463,7 +463,11 @@ int nv_kern_mmap(
NV_PRINT_AT(NV_DBG_MEMINFO, at);
nv_vm_list_page_count(&at->page_table[i], pages);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
+ vma->vm_flags |= (VM_IO | VM_LOCKED | (VM_DONTEXPAND | VM_DONTDUMP));
+#else
vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED);
+#endif
#if defined(VM_DRIVER_PAGES)
vma->vm_flags |= VM_DRIVER_PAGES;
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-17/nvidia-kmod.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- nvidia-kmod.spec 17 Jan 2013 09:28:02 -0000 1.151
+++ nvidia-kmod.spec 19 Jan 2013 23:09:56 -0000 1.152
@@ -3,13 +3,13 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+%define buildforkernels current
Name: nvidia-kmod
Epoch: 1
Version: 304.64
# Taken over by kmodtool
-Release: 1%{?dist}.8
+Release: 2%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -24,7 +24,7 @@
# </switch me>
Source11: nvidia-kmodtool-excludekernel-filterfile
-
+Patch0: 3.7_kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,7 +51,7 @@
for arch in x86 x64
do
pushd nvidiapkg-${arch}
- echo "NoPatch"
+%patch0 -p1
popd
done
@@ -85,6 +85,9 @@
%changelog
+* Sat Jan 19 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:304.64-2
+- patch for 3.7 kernel
+
* Thu Jan 17 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:304.64-1.8
- Rebuilt for updated kernel
11 years, 3 months
rpms/nvidia-173xx-kmod/F-17 3.7_kernel.patch, NONE, 1.1 nvidia-173xx-kmod.spec, 1.83, 1.84 sources, 1.12, 1.13 3.6_kernel.patch, 1.1, NONE
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-173xx-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26977
Modified Files:
nvidia-173xx-kmod.spec sources
Added Files:
3.7_kernel.patch
Removed Files:
3.6_kernel.patch
Log Message:
* Sat Jan 19 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 173.14.36-1
- Update to 173.14.36
- patch for 3.7 kernel
3.7_kernel.patch:
conftest.sh | 7 ++++++-
nv.c | 4 ++++
2 files changed, 10 insertions(+), 1 deletion(-)
--- NEW FILE 3.7_kernel.patch ---
--- a/usr/src/nv/conftest.sh
+++ b/usr/src/nv/conftest.sh
@@ -127,6 +127,7 @@ build_cflags() {
if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
+ MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/arch/x86/include/uapi"
fi
if [ "$XEN_PRESENT" != "0" ]; then
MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-xen $MACH_CFLAGS"
@@ -136,6 +137,7 @@ build_cflags() {
if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
+ MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/arch/x86/include/uapi"
fi
if [ "$XEN_PRESENT" != "0" ]; then
MACH_CFLAGS="-I$HEADERS/asm/mach-xen $MACH_CFLAGS"
@@ -143,9 +145,12 @@ build_cflags() {
fi
CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
+ CFLAGS="$CFLAGS -I$HEADERS -I$HEADERS/uapi"
if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
- CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$OUTPUT/arch/x86/include/generated"
+ CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include"
+ CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated"
+ CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated/uapi"
fi
if [ -n "$BUILD_PARAMS" ]; then
CFLAGS="$CFLAGS -D$BUILD_PARAMS"
--- a/usr/src/nv/nv.c
+++ b/usr/src/nv/nv.c
@@ -2609,7 +2609,11 @@ int nv_kern_mmap(
/* prevent the swapper from swapping it out */
/* mark the memory i/o so the buffers aren't dumped on core dumps */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
+ vma->vm_flags |= (VM_IO | VM_LOCKED | (VM_DONTEXPAND | VM_DONTDUMP));
+#else
vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED);
+#endif
}
NV_VMA_FILE(vma) = file;
Index: nvidia-173xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-173xx-kmod/F-17/nvidia-173xx-kmod.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- nvidia-173xx-kmod.spec 17 Jan 2013 09:27:42 -0000 1.83
+++ nvidia-173xx-kmod.spec 19 Jan 2013 23:05:29 -0000 1.84
@@ -3,12 +3,12 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+%define buildforkernels current
Name: nvidia-173xx-kmod
-Version: 173.14.35
+Version: 173.14.36
# Taken over by kmodtool
-Release: 2%{?dist}.17
+Release: 1%{?dist}
Summary: NVIDIA 173xx display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -23,7 +23,7 @@
# </switch me>
#http://www.nvnews.net/vbulletin/attachment.php?attachmentid=32570&d=1218222727
-Patch0: 3.6_kernel.patch
+Patch0: 3.7_kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -95,6 +95,10 @@
%changelog
+* Sat Jan 19 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 173.14.36-1
+- Update to 173.14.36
+- patch for 3.7 kernel
+
* Thu Jan 17 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.35-2.17
- Rebuilt for updated kernel
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-173xx-kmod/F-17/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 5 Jun 2012 21:25:27 -0000 1.12
+++ sources 19 Jan 2013 23:05:29 -0000 1.13
@@ -1 +1 @@
-7f7637fdf254d906e2a677cbb8622428 nvidia-kmod-data-173.14.35.tar.bz2
+64bddf592e61efb23d6a65be0bd0e661 nvidia-kmod-data-173.14.36.tar.bz2
--- 3.6_kernel.patch DELETED ---
11 years, 3 months