rpms/xorg-x11-drv-nvidia/F-17 .cvsignore, 1.46, 1.47 sources, 1.48, 1.49 xorg-x11-drv-nvidia.spec, 1.81, 1.82
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv885
Modified Files:
.cvsignore sources xorg-x11-drv-nvidia.spec
Log Message:
* Sat Aug 04 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1:304.32-1
- Update to 304.32
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-17/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore 11 Jun 2012 18:26:33 -0000 1.46
+++ .cvsignore 4 Aug 2012 21:17:14 -0000 1.47
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86-295.59.run
-NVIDIA-Linux-x86_64-295.59.run
+NVIDIA-Linux-x86_64-304.32.run
+NVIDIA-Linux-x86-304.32.run
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-17/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources 1 Aug 2012 22:06:22 -0000 1.48
+++ sources 4 Aug 2012 21:17:14 -0000 1.49
@@ -1,2 +1,2 @@
-2fb7a7e00404145a842d32b691ea94b6 NVIDIA-Linux-x86-304.30.run
-6080d3c32a86c4c5d25071406cd3d8ba NVIDIA-Linux-x86_64-304.30.run
+207faf7a195e336370ec916782d47850 NVIDIA-Linux-x86_64-304.32.run
+e917f4b0f8deb28496bb16a035294c46 NVIDIA-Linux-x86-304.32.run
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-17/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- xorg-x11-drv-nvidia.spec 1 Aug 2012 22:06:22 -0000 1.81
+++ xorg-x11-drv-nvidia.spec 4 Aug 2012 21:17:15 -0000 1.82
@@ -6,7 +6,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
-Version: 304.30
+Version: 304.32
Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
@@ -356,6 +356,9 @@
%changelog
+* Sat Aug 04 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1:304.32-1
+- Update to 304.32
+
* Wed Aug 01 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1:304.30-1
- Update to 304.30
11 years, 9 months
rpms/libva-intel-driver/F-17 .cvsignore, 1.2, 1.3 libva-intel-driver.spec, 1.1, 1.2 sources, 1.2, 1.3
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/libva-intel-driver/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv32464/F-17
Modified Files:
.cvsignore libva-intel-driver.spec sources
Log Message:
Update to 1.0.18
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/libva-intel-driver/F-17/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 30 May 2012 20:36:11 -0000 1.2
+++ .cvsignore 3 Aug 2012 22:32:54 -0000 1.3
@@ -1 +1 @@
-intel-driver-1.0.15.tar.bz2
+intel-driver-1.0.18.tar.bz2
Index: libva-intel-driver.spec
===================================================================
RCS file: /cvs/free/rpms/libva-intel-driver/F-17/libva-intel-driver.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libva-intel-driver.spec 30 May 2012 20:36:12 -0000 1.1
+++ libva-intel-driver.spec 3 Aug 2012 22:32:54 -0000 1.2
@@ -1,7 +1,7 @@
#global _with_gen4asm 1
Name: libva-intel-driver
-Version: 1.0.15
+Version: 1.0.18
Release: 4%{?dist}
Summary: HW video decode support for Intel integrated graphics
Group: System Environment/Libraries
@@ -15,12 +15,12 @@
BuildRequires: libtool
%{?_with_gen4asm:BuildRequires: intel-gen4asm >= 1.2}
-BuildRequires: libudev-devel
+BuildRequires: pkgconfig(libudev)
BuildRequires: libXext-devel
BuildRequires: libXfixes-devel
BuildRequires: libdrm-devel >= 2.4.23
BuildRequires: libpciaccess-devel
-BuildRequires: libva-devel >= 1.0.14
+BuildRequires: libva-devel >= 1.0.16
BuildRequires: mesa-libGL-devel
#Introduced in F-17
@@ -73,6 +73,15 @@
%changelog
+* Fri Aug 03 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0.18-4
+- Update to final 1.0.18
+
+* Wed Jul 11 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0.18-3
+- Switch to pkgconfig(libudev)
+
+* Mon Jun 04 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0.18-1
+- Update to 1.0.18
+
* Sat May 26 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0.15-4
- Introduce --with gen4asm
Index: sources
===================================================================
RCS file: /cvs/free/rpms/libva-intel-driver/F-17/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 30 May 2012 20:36:12 -0000 1.2
+++ sources 3 Aug 2012 22:32:54 -0000 1.3
@@ -1 +1 @@
-9dbd642f18993335146480a3a2987874 intel-driver-1.0.15.tar.bz2
+f65ebbcb1071188405178f3a85831ffc intel-driver-1.0.18.tar.bz2
11 years, 9 months
rpms/libva-intel-driver/F-16 .cvsignore, 1.2, 1.3 libva-intel-driver.spec, 1.1, 1.2 sources, 1.2, 1.3
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/libva-intel-driver/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv32464/F-16
Modified Files:
.cvsignore libva-intel-driver.spec sources
Log Message:
Update to 1.0.18
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/libva-intel-driver/F-16/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 30 May 2012 20:36:38 -0000 1.2
+++ .cvsignore 3 Aug 2012 22:32:54 -0000 1.3
@@ -1 +1 @@
-intel-driver-1.0.15.tar.bz2
+intel-driver-1.0.18.tar.bz2
Index: libva-intel-driver.spec
===================================================================
RCS file: /cvs/free/rpms/libva-intel-driver/F-16/libva-intel-driver.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libva-intel-driver.spec 30 May 2012 20:36:38 -0000 1.1
+++ libva-intel-driver.spec 3 Aug 2012 22:32:54 -0000 1.2
@@ -1,7 +1,7 @@
#global _with_gen4asm 1
Name: libva-intel-driver
-Version: 1.0.15
+Version: 1.0.18
Release: 4%{?dist}
Summary: HW video decode support for Intel integrated graphics
Group: System Environment/Libraries
@@ -15,12 +15,12 @@
BuildRequires: libtool
%{?_with_gen4asm:BuildRequires: intel-gen4asm >= 1.2}
-BuildRequires: libudev-devel
+BuildRequires: pkgconfig(libudev)
BuildRequires: libXext-devel
BuildRequires: libXfixes-devel
BuildRequires: libdrm-devel >= 2.4.23
BuildRequires: libpciaccess-devel
-BuildRequires: libva-devel >= 1.0.14
+BuildRequires: libva-devel >= 1.0.16
BuildRequires: mesa-libGL-devel
#Introduced in F-17
@@ -73,6 +73,15 @@
%changelog
+* Fri Aug 03 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0.18-4
+- Update to final 1.0.18
+
+* Wed Jul 11 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0.18-3
+- Switch to pkgconfig(libudev)
+
+* Mon Jun 04 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0.18-1
+- Update to 1.0.18
+
* Sat May 26 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0.15-4
- Introduce --with gen4asm
Index: sources
===================================================================
RCS file: /cvs/free/rpms/libva-intel-driver/F-16/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 30 May 2012 20:36:38 -0000 1.2
+++ sources 3 Aug 2012 22:32:54 -0000 1.3
@@ -1 +1 @@
-9dbd642f18993335146480a3a2987874 intel-driver-1.0.15.tar.bz2
+f65ebbcb1071188405178f3a85831ffc intel-driver-1.0.18.tar.bz2
11 years, 9 months
rpms/libva-intel-driver/devel libva-intel-driver.spec, 1.4, 1.5 sources, 1.3, 1.4
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/libva-intel-driver/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv32395/devel
Modified Files:
libva-intel-driver.spec sources
Log Message:
Update to 1.0.18
Index: libva-intel-driver.spec
===================================================================
RCS file: /cvs/free/rpms/libva-intel-driver/devel/libva-intel-driver.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libva-intel-driver.spec 11 Jul 2012 18:37:37 -0000 1.4
+++ libva-intel-driver.spec 3 Aug 2012 22:32:13 -0000 1.5
@@ -2,7 +2,7 @@
Name: libva-intel-driver
Version: 1.0.18
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: HW video decode support for Intel integrated graphics
Group: System Environment/Libraries
License: MIT and EPL
@@ -20,7 +20,7 @@
BuildRequires: libXfixes-devel
BuildRequires: libdrm-devel >= 2.4.23
BuildRequires: libpciaccess-devel
-BuildRequires: libva-devel >= 1.0.14
+BuildRequires: libva-devel >= 1.0.16
BuildRequires: mesa-libGL-devel
#Introduced in F-17
@@ -73,6 +73,9 @@
%changelog
+* Fri Aug 03 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0.18-4
+- Update to final 1.0.18
+
* Wed Jul 11 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0.18-3
- Switch to pkgconfig(libudev)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/libva-intel-driver/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 4 Jun 2012 19:28:32 -0000 1.3
+++ sources 3 Aug 2012 22:32:13 -0000 1.4
@@ -1 +1 @@
-d8c52f07148dfb2e0407549b90300bc1 intel-driver-1.0.18.tar.bz2
+f65ebbcb1071188405178f3a85831ffc intel-driver-1.0.18.tar.bz2
11 years, 9 months
rpms/xorg-x11-drv-nvidia/F-16 sources, 1.45, 1.46 xorg-x11-drv-nvidia.spec, 1.79, 1.80
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14892
Modified Files:
sources xorg-x11-drv-nvidia.spec
Log Message:
* Mon Jun 11 2012 leigh scott <leigh123linux(a)googlemail.com> - 1:295.59-1
- Update to 295.59
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-16/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources 1 Aug 2012 22:10:04 -0000 1.45
+++ sources 3 Aug 2012 10:17:41 -0000 1.46
@@ -1,2 +1,2 @@
-2fb7a7e00404145a842d32b691ea94b6 NVIDIA-Linux-x86-304.30.run
-6080d3c32a86c4c5d25071406cd3d8ba NVIDIA-Linux-x86_64-304.30.run
+bef732dfcf5cb079c06c1e8672d8d5dd NVIDIA-Linux-x86-295.59.run
+a921cfdb0162b9bb788c4486b1e6d725 NVIDIA-Linux-x86_64-295.59.run
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-16/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- xorg-x11-drv-nvidia.spec 1 Aug 2012 22:10:04 -0000 1.79
+++ xorg-x11-drv-nvidia.spec 3 Aug 2012 10:17:41 -0000 1.80
@@ -6,7 +6,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
-Version: 304.30
+Version: 295.59
Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
@@ -200,7 +200,7 @@
install -p -m 0644 libXvMCNVIDIA.a $RPM_BUILD_ROOT%{nvidialibdir}/
# Install binaries
-install -p -m 0755 nvidia-{bug-report.sh,smi,cuda-proxy-control,cuda-proxy-server} $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 nvidia-{bug-report.sh,smi} $RPM_BUILD_ROOT%{_bindir}
# Install man pages
install -m 0755 -d $RPM_BUILD_ROOT%{_mandir}/man1/
@@ -317,8 +317,6 @@
#{_initrddir}/nvidia
%{_bindir}/nvidia-bug-report.sh
%{_bindir}/nvidia-smi
-%{_bindir}/nvidia-cuda-proxy-control
-%{_bindir}/nvidia-cuda-proxy-server
#{_sbindir}/nvidia-config-display
# Xorg libs that do not need to be multilib
%dir %{_libdir}/xorg/modules/extensions/nvidia
@@ -327,7 +325,6 @@
#/no_multilib
%{_datadir}/pixmaps/*.png
%{_mandir}/man1/nvidia-smi.*
-%{_mandir}/man1/nvidia-cuda-proxy-control.1.*
%files libs
%defattr(-,root,root,-)
@@ -352,13 +349,9 @@
%{nvidialibdir}/libXvMCNVIDIA.so
%{nvidialibdir}/libnvcuvid.so
%{nvidialibdir}/libnvidia-ml.so
-%{nvidialibdir}/libnvidia-opencl.so
%changelog
-* Wed Aug 01 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1:304.30-1
-- Update to 304.30
-
* Mon Jun 11 2012 leigh scott <leigh123linux(a)googlemail.com> - 1:295.59-1
- Update to 295.59
11 years, 9 months
rpms/nvidia-kmod/F-16 nvidia-kmod.spec,1.146,1.147 sources,1.47,1.48
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-kmod/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14205
Modified Files:
nvidia-kmod.spec sources
Log Message:
* Fri Aug 01 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1:295.59-1.7
- Rebuilt for updated kernel
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-16/nvidia-kmod.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- nvidia-kmod.spec 1 Aug 2012 22:52:32 -0000 1.146
+++ nvidia-kmod.spec 3 Aug 2012 10:10:07 -0000 1.147
@@ -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 current
+%define buildforkernels newest
Name: nvidia-kmod
Epoch: 1
-Version: 304.30
+Version: 295.59
# Taken over by kmodtool
-Release: 2%{?dist}
+Release: 1%{?dist}.7
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -77,11 +77,8 @@
%changelog
-* Wed Aug 01 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1:304.30-2
-- build for current
-
-* Wed Aug 01 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1:304.30-1
-- Update to 304.30
+* Fri Aug 01 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1:295.59-1.7
+- Rebuilt for updated kernel
* Tue Jul 31 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:295.59-1.6
- Rebuilt for updated kernel
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-16/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources 1 Aug 2012 22:22:06 -0000 1.47
+++ sources 3 Aug 2012 10:10:07 -0000 1.48
@@ -1 +1 @@
-f595716710d0f56366ffd7cd506b6398 nvidia-kmod-data-304.30.tar.xz
+4ff9b2a6e8f99357610cc020adcd9689 nvidia-kmod-data-295.59.tar.xz
11 years, 9 months
rpms/openafs-kmod/F-17 openafs-1.6.1-clear_inode.patch, NONE, 1.1 openafs-1.6.1-encode_fh.patch, NONE, 1.1 openafs-kmod.spec, 1.39, 1.40
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23784
Modified Files:
openafs-kmod.spec
Added Files:
openafs-1.6.1-clear_inode.patch openafs-1.6.1-encode_fh.patch
Log Message:
* Wed Aug 01 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.1-2
- Add upstream patches for kernel 3.5
openafs-1.6.1-clear_inode.patch:
acinclude.m4 | 3 +++
src/afs/LINUX/osi_vfsops.c | 5 ++++-
2 files changed, 7 insertions(+), 1 deletion(-)
--- NEW FILE openafs-1.6.1-clear_inode.patch ---
>From cc63cbbc138f60d6b5964fa859dcd778717b24c2 Mon Sep 17 00:00:00 2001
From: Marc Dionne <marc.c.dionne(a)gmail.com>
Date: Mon, 28 May 2012 21:43:12 -0400
Subject: [PATCH] Linux 3.4: replace end_writeback with clear_inode
end_writeback() is renamed to clear_inode(). Add a configure test
and cope.
Change-Id: Icaf5b6b54d0ee377fabcf0b295d690eaa6b4be5e
Reviewed-on: http://gerrit.openafs.org/7503
Reviewed-by: Derrick Brashear <shadow(a)dementix.org>
Tested-by: BuildBot <buildbot(a)rampaginggeek.com>
(cherry picked from commit 2b33384a4a7b88842281021129ffccc837d91d36)
Reviewed-on: http://gerrit.openafs.org/7578
---
acinclude.m4 | 3 +++
src/afs/LINUX/osi_vfsops.c | 4 ++++
2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/acinclude.m4 b/acinclude.m4
index 45f06cb..9085afe 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -840,6 +840,9 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
#include <linux/page-flags.h>],
[struct page *_page;
int bchecked = PageFsMisc(_page);])
+ AC_CHECK_LINUX_FUNC([clear_inode],
+ [#include <linux/fs.h>],
+ [clear_inode(NULL);])
AC_CHECK_LINUX_FUNC([current_kernel_time],
[#include <linux/time.h>],
[struct timespec s;
diff --git a/src/afs/LINUX/osi_vfsops.c b/src/afs/LINUX/osi_vfsops.c
index a6be1b3..bc951a2 100644
--- a/src/afs/LINUX/osi_vfsops.c
+++ b/src/afs/LINUX/osi_vfsops.c
@@ -284,7 +284,11 @@ afs_evict_inode(struct inode *ip)
osi_Panic("inode freed while still hashed");
truncate_inode_pages(&ip->i_data, 0);
+#if defined(HAVE_LINUX_CLEAR_INODE)
+ clear_inode(ip);
+#else
end_writeback(ip);
+#endif
#if !defined(STRUCT_SUPER_OPERATIONS_HAS_ALLOC_INODE)
afs_osi_Free(ip->u.generic_ip, sizeof(struct vcache));
--
1.7.2.5
openafs-1.6.1-encode_fh.patch:
acinclude.m4 | 1 +
src/afs/LINUX/osi_compat.h | 4 ++++
src/cf/linux-test4.m4 | 15 ++++++++++++++-
3 files changed, 19 insertions(+), 1 deletion(-)
--- NEW FILE openafs-1.6.1-encode_fh.patch ---
>From 407e7c90a97143d436ad3a6af6bbfa431c849191 Mon Sep 17 00:00:00 2001
From: Marc Dionne <marc.c.dionne(a)gmail.com>
Date: Sat, 2 Jun 2012 21:35:53 -0400
Subject: [PATCH] Linux 3.5: encode_fh API change
The encode_fh export operation now expects two inode arguments
instead of a dentry and a "connectable" flag. Use the inode of
the dentry we're interested in, and NULL as the parent inode which
is the same as passing a 0 flag in the previous API.
Change-Id: I05cf146fb2a4bacdca20a9f108d04ccb11530804
Reviewed-on: http://gerrit.openafs.org/7523
Tested-by: BuildBot <buildbot(a)rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow(a)dementix.org>
(cherry picked from commit 5227148ae17949705487ea673d558ebfe143e635)
Reviewed-on: http://gerrit.openafs.org/7579
---
acinclude.m4 | 1 +
src/afs/LINUX/osi_compat.h | 4 ++++
src/cf/linux-test4.m4 | 14 ++++++++++++++
3 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/acinclude.m4 b/acinclude.m4
index c14b581..25484cf 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -958,6 +958,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
LINUX_D_COUNT_IS_INT
LINUX_IOP_MKDIR_TAKES_UMODE_T
LINUX_IOP_CREATE_TAKES_UMODE_T
+ LINUX_EXPORT_OP_ENCODE_FH_TAKES_INODES
dnl If we are guaranteed that keyrings will work - that is
dnl a) The kernel has keyrings enabled
diff --git a/src/afs/LINUX/osi_compat.h b/src/afs/LINUX/osi_compat.h
index b94295c..4c7c261 100644
--- a/src/afs/LINUX/osi_compat.h
+++ b/src/afs/LINUX/osi_compat.h
@@ -333,7 +333,11 @@ afs_get_dentry_from_fh(struct super_block *afs_cacheSBp, afs_dcache_id_t *ainode
static inline int
afs_get_fh_from_dentry(struct dentry *dp, afs_ufs_dcache_id_t *ainode, int *max_lenp) {
if (dp->d_sb->s_export_op->encode_fh)
+#if defined(EXPORT_OP_ENCODE_FH_TAKES_INODES)
+ return dp->d_sb->s_export_op->encode_fh(dp->d_inode, &ainode->raw[0], max_lenp, NULL);
+#else
return dp->d_sb->s_export_op->encode_fh(dp, &ainode->raw[0], max_lenp, 0);
+#endif
#if defined(NEW_EXPORT_OPS)
/* If fs doesn't provide an encode_fh method, assume the default INO32 type */
*max_lenp = sizeof(struct fid)/4;
diff --git a/src/cf/linux-test4.m4 b/src/cf/linux-test4.m4
index f5e91b1..f13e97d 100644
--- a/src/cf/linux-test4.m4
+++ b/src/cf/linux-test4.m4
@@ -661,3 +661,17 @@ AC_DEFUN([LINUX_IOP_CREATE_TAKES_UMODE_T], [
[define if inode.i_op->create takes a umode_t argument],
[-Werror])
])
+
+
+AC_DEFUN([LINUX_EXPORT_OP_ENCODE_FH_TAKES_INODES], [
+ AC_CHECK_LINUX_BUILD([whether export operation encode_fh takes inode arguments],
+ [ac_cv_linux_export_op_encode_fh__takes_inodes],
+ [#include <linux/exportfs.h>],
+ [struct export_operations _exp_ops;
+ int _encode_fh(struct inode *i, __u32 *fh, int *len, struct inode *p)
+ {return 0;};
+ _exp_ops.encode_fh = _encode_fh;],
+ [EXPORT_OP_ENCODE_FH_TAKES_INODES],
+ [define if encode_fh export op takes inode arguments],
+ [-Werror])
+])
--
1.7.2.5
Index: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-17/openafs-kmod.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- openafs-kmod.spec 31 Jul 2012 06:35:59 -0000 1.39
+++ openafs-kmod.spec 2 Aug 2012 07:42:42 -0000 1.40
@@ -21,7 +21,7 @@
Name: %{kmod_name}-kmod
Version: 1.6.1
-Release: 1%{?dist}.19
+Release: 2%{?dist}
Summary: Kernel module(s)
Group: System Environment/Kernel
@@ -31,6 +31,10 @@
Source0: http://dl.openafs.org/dl/%{version}/%{kmod_name}-%{version}-src.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Upstream patches to build on newer kernels
+Patch0: openafs-1.6.1-clear_inode.patch
+Patch1: openafs-1.6.1-encode_fh.patch
+
%global AkmodsBuildRequires %{_bindir}/kmodtool, pam-devel, ncurses-devel, flex, byacc, bison, automake
BuildRequires: %{AkmodsBuildRequires}
@@ -56,8 +60,11 @@
%setup -q -c -T -a 0
# apply patches and do other stuff here
-#pushd %{kmod_name}-%{version}
-#popd
+pushd %{kmod_name}-%{version}
+%patch0 -p1
+%patch1 -p1
+./regen.sh
+popd
for kernel_version in %{?kernel_versions} ; do
cp -a %{kmod_name}-%{version} _kmod_build_${kernel_version%%___*}
@@ -94,6 +101,9 @@
%changelog
+* Wed Aug 01 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.1-2
+- Add upstream patches for kernel 3.5
+
* Tue Jul 31 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-1.19
- Rebuilt for updated kernel
11 years, 9 months
rpms/openafs-kmod/devel openafs-1.6.1-clear_inode.patch, NONE, 1.1 openafs-1.6.1-encode_fh.patch, NONE, 1.1 openafs-kmod.spec, 1.20, 1.21
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23546
Modified Files:
openafs-kmod.spec
Added Files:
openafs-1.6.1-clear_inode.patch openafs-1.6.1-encode_fh.patch
Log Message:
* Wed Aug 01 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.1-2
- Add upstream patches for kernel 3.5
openafs-1.6.1-clear_inode.patch:
acinclude.m4 | 3 +++
src/afs/LINUX/osi_vfsops.c | 5 ++++-
2 files changed, 7 insertions(+), 1 deletion(-)
--- NEW FILE openafs-1.6.1-clear_inode.patch ---
>From cc63cbbc138f60d6b5964fa859dcd778717b24c2 Mon Sep 17 00:00:00 2001
From: Marc Dionne <marc.c.dionne(a)gmail.com>
Date: Mon, 28 May 2012 21:43:12 -0400
Subject: [PATCH] Linux 3.4: replace end_writeback with clear_inode
end_writeback() is renamed to clear_inode(). Add a configure test
and cope.
Change-Id: Icaf5b6b54d0ee377fabcf0b295d690eaa6b4be5e
Reviewed-on: http://gerrit.openafs.org/7503
Reviewed-by: Derrick Brashear <shadow(a)dementix.org>
Tested-by: BuildBot <buildbot(a)rampaginggeek.com>
(cherry picked from commit 2b33384a4a7b88842281021129ffccc837d91d36)
Reviewed-on: http://gerrit.openafs.org/7578
---
acinclude.m4 | 3 +++
src/afs/LINUX/osi_vfsops.c | 4 ++++
2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/acinclude.m4 b/acinclude.m4
index 45f06cb..9085afe 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -840,6 +840,9 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
#include <linux/page-flags.h>],
[struct page *_page;
int bchecked = PageFsMisc(_page);])
+ AC_CHECK_LINUX_FUNC([clear_inode],
+ [#include <linux/fs.h>],
+ [clear_inode(NULL);])
AC_CHECK_LINUX_FUNC([current_kernel_time],
[#include <linux/time.h>],
[struct timespec s;
diff --git a/src/afs/LINUX/osi_vfsops.c b/src/afs/LINUX/osi_vfsops.c
index a6be1b3..bc951a2 100644
--- a/src/afs/LINUX/osi_vfsops.c
+++ b/src/afs/LINUX/osi_vfsops.c
@@ -284,7 +284,11 @@ afs_evict_inode(struct inode *ip)
osi_Panic("inode freed while still hashed");
truncate_inode_pages(&ip->i_data, 0);
+#if defined(HAVE_LINUX_CLEAR_INODE)
+ clear_inode(ip);
+#else
end_writeback(ip);
+#endif
#if !defined(STRUCT_SUPER_OPERATIONS_HAS_ALLOC_INODE)
afs_osi_Free(ip->u.generic_ip, sizeof(struct vcache));
--
1.7.2.5
openafs-1.6.1-encode_fh.patch:
acinclude.m4 | 1 +
src/afs/LINUX/osi_compat.h | 4 ++++
src/cf/linux-test4.m4 | 15 ++++++++++++++-
3 files changed, 19 insertions(+), 1 deletion(-)
--- NEW FILE openafs-1.6.1-encode_fh.patch ---
>From 407e7c90a97143d436ad3a6af6bbfa431c849191 Mon Sep 17 00:00:00 2001
From: Marc Dionne <marc.c.dionne(a)gmail.com>
Date: Sat, 2 Jun 2012 21:35:53 -0400
Subject: [PATCH] Linux 3.5: encode_fh API change
The encode_fh export operation now expects two inode arguments
instead of a dentry and a "connectable" flag. Use the inode of
the dentry we're interested in, and NULL as the parent inode which
is the same as passing a 0 flag in the previous API.
Change-Id: I05cf146fb2a4bacdca20a9f108d04ccb11530804
Reviewed-on: http://gerrit.openafs.org/7523
Tested-by: BuildBot <buildbot(a)rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow(a)dementix.org>
(cherry picked from commit 5227148ae17949705487ea673d558ebfe143e635)
Reviewed-on: http://gerrit.openafs.org/7579
---
acinclude.m4 | 1 +
src/afs/LINUX/osi_compat.h | 4 ++++
src/cf/linux-test4.m4 | 14 ++++++++++++++
3 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/acinclude.m4 b/acinclude.m4
index c14b581..25484cf 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -958,6 +958,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
LINUX_D_COUNT_IS_INT
LINUX_IOP_MKDIR_TAKES_UMODE_T
LINUX_IOP_CREATE_TAKES_UMODE_T
+ LINUX_EXPORT_OP_ENCODE_FH_TAKES_INODES
dnl If we are guaranteed that keyrings will work - that is
dnl a) The kernel has keyrings enabled
diff --git a/src/afs/LINUX/osi_compat.h b/src/afs/LINUX/osi_compat.h
index b94295c..4c7c261 100644
--- a/src/afs/LINUX/osi_compat.h
+++ b/src/afs/LINUX/osi_compat.h
@@ -333,7 +333,11 @@ afs_get_dentry_from_fh(struct super_block *afs_cacheSBp, afs_dcache_id_t *ainode
static inline int
afs_get_fh_from_dentry(struct dentry *dp, afs_ufs_dcache_id_t *ainode, int *max_lenp) {
if (dp->d_sb->s_export_op->encode_fh)
+#if defined(EXPORT_OP_ENCODE_FH_TAKES_INODES)
+ return dp->d_sb->s_export_op->encode_fh(dp->d_inode, &ainode->raw[0], max_lenp, NULL);
+#else
return dp->d_sb->s_export_op->encode_fh(dp, &ainode->raw[0], max_lenp, 0);
+#endif
#if defined(NEW_EXPORT_OPS)
/* If fs doesn't provide an encode_fh method, assume the default INO32 type */
*max_lenp = sizeof(struct fid)/4;
diff --git a/src/cf/linux-test4.m4 b/src/cf/linux-test4.m4
index f5e91b1..f13e97d 100644
--- a/src/cf/linux-test4.m4
+++ b/src/cf/linux-test4.m4
@@ -661,3 +661,17 @@ AC_DEFUN([LINUX_IOP_CREATE_TAKES_UMODE_T], [
[define if inode.i_op->create takes a umode_t argument],
[-Werror])
])
+
+
+AC_DEFUN([LINUX_EXPORT_OP_ENCODE_FH_TAKES_INODES], [
+ AC_CHECK_LINUX_BUILD([whether export operation encode_fh takes inode arguments],
+ [ac_cv_linux_export_op_encode_fh__takes_inodes],
+ [#include <linux/exportfs.h>],
+ [struct export_operations _exp_ops;
+ int _encode_fh(struct inode *i, __u32 *fh, int *len, struct inode *p)
+ {return 0;};
+ _exp_ops.encode_fh = _encode_fh;],
+ [EXPORT_OP_ENCODE_FH_TAKES_INODES],
+ [define if encode_fh export op takes inode arguments],
+ [-Werror])
+])
--
1.7.2.5
Index: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/devel/openafs-kmod.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- openafs-kmod.spec 4 Apr 2012 18:40:59 -0000 1.20
+++ openafs-kmod.spec 2 Aug 2012 07:41:24 -0000 1.21
@@ -21,7 +21,7 @@
Name: %{kmod_name}-kmod
Version: 1.6.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Kernel module(s)
Group: System Environment/Kernel
@@ -31,6 +31,10 @@
Source0: http://dl.openafs.org/dl/%{version}/%{kmod_name}-%{version}-src.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Upstream patches to build on newer kernels
+Patch0: openafs-1.6.1-clear_inode.patch
+Patch1: openafs-1.6.1-encode_fh.patch
+
%global AkmodsBuildRequires %{_bindir}/kmodtool, pam-devel, ncurses-devel, flex, byacc, bison, automake
BuildRequires: %{AkmodsBuildRequires}
@@ -56,8 +60,11 @@
%setup -q -c -T -a 0
# apply patches and do other stuff here
-#pushd %{kmod_name}-%{version}
-#popd
+pushd %{kmod_name}-%{version}
+%patch0 -p1
+%patch1 -p1
+./regen.sh
+popd
for kernel_version in %{?kernel_versions} ; do
cp -a %{kmod_name}-%{version} _kmod_build_${kernel_version%%___*}
@@ -94,6 +101,8 @@
%changelog
+* Wed Aug 01 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.1-2
+- Add upstream patches for kernel 3.5
* Wed Apr 04 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.1-1
- Update to OpenAFS 1.6.1 final
11 years, 9 months
rpms/nvidia-kmod/F-16 nvidia-kmod.spec,1.145,1.146
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-kmod/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15409
Modified Files:
nvidia-kmod.spec
Log Message:
* Wed Aug 01 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1:304.30-2
- build for current
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-16/nvidia-kmod.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- nvidia-kmod.spec 1 Aug 2012 22:22:06 -0000 1.145
+++ nvidia-kmod.spec 1 Aug 2012 22:52:32 -0000 1.146
@@ -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.30
# Taken over by kmodtool
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -77,6 +77,9 @@
%changelog
+* Wed Aug 01 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1:304.30-2
+- build for current
+
* Wed Aug 01 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1:304.30-1
- Update to 304.30
11 years, 9 months
rpms/nvidia-xconfig/F-16 nvidia-xconfig.spec,1.18,1.19
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-xconfig/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14969
Modified Files:
nvidia-xconfig.spec
Log Message:
* Tue Jul 31 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0-17
- Update to 304.30
Index: nvidia-xconfig.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-xconfig/F-16/nvidia-xconfig.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- nvidia-xconfig.spec 1 Aug 2012 22:15:07 -0000 1.18
+++ nvidia-xconfig.spec 1 Aug 2012 22:48:07 -0000 1.19
@@ -2,7 +2,7 @@
Name: nvidia-xconfig
Version: 1.0
-Release: 20%{?dist}
+Release: 17%{?dist}
Summary: NVIDIA X configuration file editor
Group: Applications/System
@@ -66,7 +66,7 @@
%{_mandir}/man1/nvidia-xconfig.1.*
%changelog
-* Tue Jul 31 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0-20
+* Tue Jul 31 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0-17
- Update to 304.30
* Tue May 22 2012 leigh scott <leigh123linux(a)googlemail.com> - 1.0-16
11 years, 9 months