Changeset 2060 for branches/fc15-dev

Timestamp:

Nov 20, 2011, 11:35:12 PM (13 years ago)

Author:

ezyang

Message:

Backport OpenAFS patches to make it work with Linux 3.1

Location:

branches/fc15-dev/server

Files:

• common/patches/openafs-linux-3.1-fsync.patch (added)
• common/patches/openafs-linux-3.1-rcu.patch (added)
• fedora/specs/openafs.spec.patch (modified) (11 diffs)

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

@@ -1 @@
---- openafs.spec.orig   2011-06-20 15:32:57.000000000 -0400
-+++ openafs.spec        2011-06-21 17:15:24.000000000 -0400
+--- rpmbuild/SPECS/openafs.spec
++++ rpmbuild/SPECS/openafs.spec.~3~     2011-11-20 20:13:52.211673609 -0500
 @@ -4,7 +4,7 @@
  %define pkgvers 1.6.0
@@ -10 +10 @@
  %{!?fedorakmod: %define fedorakmod 1}
  %{!?build_dkmspkg: %define build_dkmspkg 1}
-@@ -247,6 +247,11 @@
- %endif
+@@ -237,6 +237,13 @@
+ 
  ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64
  
@@ -18 +18 @@
 +Patch1002: openafs-systemd.patch
 +Patch1003: openafs-systemd-crond.patch
++Patch1004: openafs-linux-3.1-rcu.patch
++Patch1005: openafs-linux-3.1-fsync.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
-@@ -326,6 +329,7 @@
+@@ -316,6 +323,7 @@
  %if %{build_userspace}
  
@@ -30 +32 @@
  
  %if %{fedorakmod}
-@@ -386,6 +390,7 @@
+@@ -376,6 +384,7 @@
  
  %if %{build_authlibs}
@@ -38 +40 @@
  Group: Networking/Filesystems
  
-@@ -402,6 +407,7 @@
+@@ -392,6 +401,7 @@
  %endif
  
@@ -44 +46 @@
 +Provides: scripts-openafs-authlibs-devel
  %if %{build_authlibs}
- Requires: openafs-authlibs = %{version}
+ Requires: openafs-authlibs = %{version}-%{release}
  %endif
-@@ -420,6 +426,7 @@
+@@ -410,6 +420,7 @@
  libraries.
  
@@ -53 +55 @@
  Summary: OpenAFS Development Libraries and Headers
  Group: Development/Filesystems
- 
-@@ -448,6 +455,7 @@
+ Requires: openafs = %{version}-%{release}
+@@ -439,6 +450,7 @@
  administrators.
  
@@ -62 +64 @@
  Group: Networking/Filesystems
  Provides: openafs-kernel = %{version}
-@@ -497,6 +505,7 @@
+@@ -488,6 +500,7 @@
  
  %if %{krb5support}
@@ -70 +72 @@
  Requires: openafs = %{version}
  Group: Networking/Filesystems
-@@ -523,7 +532,7 @@
+@@ -514,7 +527,7 @@
  %if %{build_modules}
  
@@ -79 +81 @@
  %else
  
-@@ -680,6 +689,12 @@
+@@ -671,6 +684,14 @@
  #%setup -q -n %{srcdir}
  %setup -q -b 1 -n %{srcdir}
@@ -88 +90 @@
 +%patch1002 -p1 -b .systemd
 +%patch1003 -p1 -b .systemd-crond
++%patch1004 -p1 -b .rcu
++%patch1005 -p1 -b .fsync
 +
  ##############################################################################
  #
  # building
-@@ -1215,6 +1230,13 @@
+@@ -1212,6 +1233,13 @@
  rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
  rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*