Changeset 2143 for trunk

Timestamp:

Feb 27, 2012, 1:52:17 PM (12 years ago)

Author:

achernya

Message:

Update openafs to build against kernel 3.2

Location:

trunk/server

Files:

• common/patches/openafs-linux-3.2-nlink.patch (added)
• fedora/specs/openafs.spec.patch (modified) (11 diffs)

trunk/server/fedora/specs/openafs.spec.patch

@@ -1 @@
---- rpmbuild/SPECS/openafs.spec
-+++ rpmbuild/SPECS/openafs.spec.~3~     2011-11-20 20:13:52.211673609 -0500
+--- openafs.spec        2012-02-13 15:41:02.757592190 -0500
++++ openafs.spec.~3~    2012-02-13 15:48:25.366294629 -0500
 @@ -4,7 +4,7 @@
  %define pkgvers 1.6.0
@@ -10 +10 @@
  %{!?fedorakmod: %define fedorakmod 1}
  %{!?build_dkmspkg: %define build_dkmspkg 1}
-@@ -237,6 +237,14 @@
+@@ -237,6 +237,15 @@
  
  ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64
@@ -21 +21 @@
 +Patch1005: openafs-linux-3.1-fsync.patch
 +Patch1006: openafs-linux-3.1-zalloc.patch
++Patch1007: openafs-linux-3.2-nlink.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 +324,7 @@
+@@ -316,6 +325,7 @@
  %if %{build_userspace}
  
@@ -33 +34 @@
  
  %if %{fedorakmod}
-@@ -376,6 +385,7 @@
+@@ -376,6 +386,7 @@
  
  %if %{build_authlibs}
@@ -41 +42 @@
  Group: Networking/Filesystems
  
-@@ -392,6 +402,7 @@
+@@ -392,6 +403,7 @@
  %endif
  
@@ -49 +50 @@
  Requires: openafs-authlibs = %{version}-%{release}
  %endif
-@@ -410,6 +421,7 @@
+@@ -410,6 +422,7 @@
  libraries.
  
@@ -57 +58 @@
  Group: Development/Filesystems
  Requires: openafs = %{version}-%{release}
-@@ -439,6 +451,7 @@
+@@ -439,6 +452,7 @@
  administrators.
  
@@ -65 +66 @@
  Group: Networking/Filesystems
  Provides: openafs-kernel = %{version}
-@@ -488,6 +501,7 @@
+@@ -488,6 +502,7 @@
  
  %if %{krb5support}
@@ -73 +74 @@
  Requires: openafs = %{version}
  Group: Networking/Filesystems
-@@ -514,7 +528,7 @@
+@@ -514,7 +529,7 @@
  %if %{build_modules}
  
@@ -82 +83 @@
  %else
  
-@@ -671,6 +685,15 @@
+@@ -671,6 +686,16 @@
  #%setup -q -n %{srcdir}
  %setup -q -b 1 -n %{srcdir}
@@ -94 +95 @@
 +%patch1005 -p1 -b .fsync
 +%patch1006 -p1 -b .zalloc
++%patch1007 -p1 -b .nlink
 +
  ##############################################################################
  #
  # building
-@@ -1212,6 +1235,13 @@
+@@ -1212,6 +1237,13 @@
  rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
  rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*