Changeset 2337

Timestamp:

Dec 5, 2012, 2:21:01 AM (11 years ago)

Author:

andersk

Message:

Revert to OpenAFS 1.6.1 plus minimal patches for Linux 3.6

Location:

trunk/server

Files:

• common/patches/openafs-linux-support.patch (added)
• common/patches/openafs-stable-1.6.1.1.patch (deleted)
• common/patches/openafs-systemd-remote-fs.patch (copied) (copied from trunk/server/common/patches/openafs-systemd-remote-fs.patch)
• fedora/specs/openafs.spec.patch (modified) (12 diffs)

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

@@ -1 +1 @@
 --- openafs.spec.orig   2012-11-10 05:22:28.754019405 -0500
 +++ openafs.spec        2012-11-10 12:45:48.679334955 -0500
-@@ -1,10 +1,10 @@
- # Openafs Spec $Revision$
- 
- %define afsvers 1.6.1
--%define pkgvers 1.6.1
-+%define pkgvers 1.6.1.1
+@@ -4,7 +4,7 @@
+ %define pkgvers 1.6.1
  # for beta/rc releases make pkgrel 0.<tag>
  # for real releases make pkgrel 1 (or more for extra releases)
@@ -14 +10 @@
  %{!?fedorakmod: %define fedorakmod 1}
  %{!?build_dkmspkg: %define build_dkmspkg 1}
-@@ -249,9 +249,16 @@
+@@ -249,9 +249,17 @@
  %if %{build_modules}
  BuildRequires: kernel-devel
@@ -22 +18 @@
  ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64
  
-+Patch999:  openafs-stable-1.6.1.1.patch
 +Patch1000: openafs-scripts.patch
-+Patch1001: openafs-systemd-crond.patch
-+Patch1002: openafs-systemd-csdb.patch
++Patch1001: openafs-systemd-remote-fs.patch
++Patch1002: openafs-systemd-crond.patch
++Patch1003: openafs-systemd-csdb.patch
++Patch1004: openafs-linux-support.patch
 +%define _default_patch_fuzz 2
 +
@@ -31 +28 @@
  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
-@@ -331,6 +338,7 @@
+@@ -331,6 +339,7 @@
  %if %{build_userspace}
  
@@ -39 +36 @@
  %if 0%{?fedora} >= 15
  Requires: systemd-units
-@@ -403,6 +411,7 @@
+@@ -403,6 +412,7 @@
  
  %if %{build_authlibs}
@@ -47 +44 @@
  Group: Networking/Filesystems
  
-@@ -419,6 +428,7 @@
+@@ -419,6 +429,7 @@
  %endif
  
@@ -55 +52 @@
  Requires: openafs-authlibs = %{version}-%{release}
  %endif
-@@ -437,6 +447,7 @@
+@@ -437,6 +448,7 @@
  libraries.
  
@@ -63 +60 @@
  Group: Development/Filesystems
  Requires: openafs = %{version}-%{release}
-@@ -466,6 +477,7 @@
+@@ -466,6 +478,7 @@
  administrators.
  
@@ -71 +68 @@
  Group: Networking/Filesystems
  Provides: openafs-kernel = %{version}
-@@ -515,6 +527,7 @@
+@@ -515,6 +528,7 @@
  
  %if %{krb5support}
@@ -79 +76 @@
  Requires: openafs = %{version}
  Group: Networking/Filesystems
-@@ -541,7 +554,7 @@
+@@ -541,7 +555,7 @@
  %if %{build_modules}
  
@@ -88 +85 @@
  %else
  
-@@ -698,6 +711,12 @@
+@@ -698,6 +712,13 @@
  #%setup -q -n %{srcdir}
  %setup -q -b 1 -n %{srcdir}
  
 +# Apply the Scripts patch
-+%patch999  -p1 -b .1.6.1.1
 +%patch1000 -p1 -b .scripts
-+%patch1001 -p1 -b .systemd-crond
-+%patch1002 -p1 -b .systemd-csdb
++%patch1001 -p1 -b .systemd-remote-fs
++%patch1002 -p1 -b .systemd-crond
++%patch1003 -p1 -b .systemd-csdb
++%patch1004 -p1 -b .end-writeback
 +
  ##############################################################################
  #
  # building
-@@ -869,6 +888,8 @@
+@@ -869,6 +890,8 @@
  %endif
  %endif
@@ -110 +108 @@
         --prefix=%{_prefix} \
         --libdir=%{_libdir} \
-@@ -1278,6 +1299,13 @@
+@@ -1278,6 +1301,13 @@
  rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
  rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*