Changeset 2062

Timestamp:

Nov 21, 2011, 10:13:14 PM (13 years ago)

Author:

geofft

Message:

openafs: One last patch for Linux 3.1 support

Marc Dionne says, "other than that I don't see anything missing in 1.6
for 3.1".

Taken from http://gerrit.openafs.org/6104

Location:

branches/fc15-dev/server

Files:

• common/patches/openafs-linux-3.1-zalloc.patch (added)
• fedora/specs/openafs.spec.patch (modified) (10 diffs)

branches/fc15-dev/server/fedora/specs/openafs.spec.patch

@@ -10 +10 @@
  %{!?fedorakmod: %define fedorakmod 1}
  %{!?build_dkmspkg: %define build_dkmspkg 1}
-@@ -237,6 +237,13 @@
+@@ -237,6 +237,14 @@
  
  ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64
@@ -20 +20 @@
 +Patch1004: openafs-linux-3.1-rcu.patch
 +Patch1005: openafs-linux-3.1-fsync.patch
++Patch1006: openafs-linux-3.1-zalloc.patch
 +
  #    http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/...
  Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2
  Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2
-@@ -316,6 +323,7 @@
+@@ -316,6 +324,7 @@
  %if %{build_userspace}
  
@@ -32 +33 @@
  
  %if %{fedorakmod}
-@@ -376,6 +384,7 @@
+@@ -376,6 +385,7 @@
  
  %if %{build_authlibs}
@@ -40 +41 @@
  Group: Networking/Filesystems
  
-@@ -392,6 +401,7 @@
+@@ -392,6 +402,7 @@
  %endif
  
@@ -48 +49 @@
  Requires: openafs-authlibs = %{version}-%{release}
  %endif
-@@ -410,6 +420,7 @@
+@@ -410,6 +421,7 @@
  libraries.
  
@@ -56 +57 @@
  Group: Development/Filesystems
  Requires: openafs = %{version}-%{release}
-@@ -439,6 +450,7 @@
+@@ -439,6 +451,7 @@
  administrators.
  
@@ -64 +65 @@
  Group: Networking/Filesystems
  Provides: openafs-kernel = %{version}
-@@ -488,6 +500,7 @@
+@@ -488,6 +501,7 @@
  
  %if %{krb5support}
@@ -72 +73 @@
  Requires: openafs = %{version}
  Group: Networking/Filesystems
-@@ -514,7 +527,7 @@
+@@ -514,7 +528,7 @@
  %if %{build_modules}
  
@@ -81 +82 @@
  %else
  
-@@ -671,6 +684,14 @@
+@@ -671,6 +685,15 @@
  #%setup -q -n %{srcdir}
  %setup -q -b 1 -n %{srcdir}
@@ -92 +93 @@
 +%patch1004 -p1 -b .rcu
 +%patch1005 -p1 -b .fsync
++%patch1006 -p1 -b .zalloc
 +
  ##############################################################################
  #
  # building
-@@ -1212,6 +1233,13 @@
+@@ -1212,6 +1235,13 @@
  rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
  rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*