Changeset 2335 for trunk


Ignore:
Timestamp:
Nov 10, 2012, 3:21:56 PM (10 years ago)
Author:
geofft
Message:
Create patch for current openafs-stable-1_6_x as fake 1.6.1.1

Create a single large patch containing the diff between the 1.6.1
release and a new openafs-stable_1_6_1_1-branch, which was made from a
rebase of openafs-stable-1_6_x onto openafs-stable-1_6_1-branch. We
continue to revert the things reverted in 1.6.1, including "offline-less
vos release". This patch supersedes three of the patches we previously
cherry-picked.

This allows us to compile on Linux 3.6.

In order to make this work, we run ./regen.sh (= autoreconf) in the
build process. Consider removing this once we get back to closely
tracking an actual OpenAFS release.

The actual git branch is in openafs-stable-1_6_1_1-branch on
https://github.com/sipb/openafs (also in w-e:/home/scripts-build/openafs).

Location:
trunk/server
Files:
1 added
3 deleted
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/server/fedora/specs/openafs.spec.patch

    r2288 r2335  
    1 --- openafs.spec.~1~    2012-03-29 12:45:12.000000000 -0400
    2 +++ openafs.spec        2012-08-05 07:35:31.292297168 -0400
    3 @@ -4,7 +4,7 @@
    4  %define pkgvers 1.6.1
     1--- openafs.spec.orig   2012-11-10 05:22:28.754019405 -0500
     2+++ openafs.spec        2012-11-10 12:45:48.679334955 -0500
     3@@ -1,10 +1,10 @@
     4 # Openafs Spec $Revision$
     5 
     6 %define afsvers 1.6.1
     7-%define pkgvers 1.6.1
     8+%define pkgvers 1.6.1.1
    59 # for beta/rc releases make pkgrel 0.<tag>
    610 # for real releases make pkgrel 1 (or more for extra releases)
     
    1014 %{!?fedorakmod: %define fedorakmod 1}
    1115 %{!?build_dkmspkg: %define build_dkmspkg 1}
    12 @@ -252,6 +252,14 @@
     16@@ -249,9 +249,16 @@
     17 %if %{build_modules}
     18 BuildRequires: kernel-devel
     19 %endif
     20+BuildRequires: libtool
    1321 
    1422 ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64
    1523 
     24+Patch999:  openafs-stable-1.6.1.1.patch
    1625+Patch1000: openafs-scripts.patch
    17 +Patch1001: openafs-systemd-remote-fs.patch
    18 +Patch1002: openafs-systemd-crond.patch
    19 +Patch1003: openafs-systemd-csdb.patch
    20 +Patch1004: openafs-linux-3.4-end-writeback.patch
    21 +Patch1005: openafs-linux-3.5-encode-fh.patch
     26+Patch1001: openafs-systemd-crond.patch
     27+Patch1002: openafs-systemd-csdb.patch
    2228+%define _default_patch_fuzz 2
    2329+
     
    8288 %else
    8389 
    84 @@ -698,6 +711,14 @@
     90@@ -698,6 +711,12 @@
    8591 #%setup -q -n %{srcdir}
    8692 %setup -q -b 1 -n %{srcdir}
    8793 
    8894+# Apply the Scripts patch
     95+%patch999  -p1 -b .1.6.1.1
    8996+%patch1000 -p1 -b .scripts
    90 +%patch1001 -p1 -b .systemd-remote-fs
    91 +%patch1002 -p1 -b .systemd-crond
    92 +%patch1003 -p1 -b .systemd-csdb
    93 +%patch1004 -p1 -b .end-writeback
    94 +%patch1005 -p1 -b .encode-fh
     97+%patch1001 -p1 -b .systemd-crond
     98+%patch1002 -p1 -b .systemd-csdb
    9599+
    96100 ##############################################################################
    97101 #
    98102 # building
     103@@ -869,6 +888,8 @@
     104 %endif
     105 %endif
     106 
     107+./regen.sh
     108+
     109 ./configure --with-afs-sysname=${sysname} \
     110        --prefix=%{_prefix} \
     111        --libdir=%{_libdir} \
    99112@@ -1278,6 +1299,13 @@
    100113 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
Note: See TracChangeset for help on using the changeset viewer.