Ignore:
Timestamp:
Jun 20, 2011, 7:07:43 PM (11 years ago)
Author:
achernya
Message:
Update OpenAFS from 1.4.14 to 1.6.0pre6

kaduk finished porting the openafs-scripts patch to 1.6.0, which was
then lightly modified be me to get it to compile -- mostly fixing
typos.

The openafs.spec.patch was also fixed, including another chmod +x hack
on some libraries to get rpm to properly process them for Provides
directives.  Interestingly, these libraries had the correct mode in
1.4.14.

The patches that were added to get 1.4.14 to compile have also been
removed, as 1.6.0pre6 compiles on kernel 2.6.38 unmodified.

openafs-numsysnames is getting removed because 32 is now the default.

openafs-localcsdb is getting removed because the change was included
in kaduk's patchset.

Location:
branches/fc15-dev/server/fedora
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/fc15-dev/server/fedora/Makefile

    r1884 r1913  
    4040server_url      = "http://web.mit.edu/scripts/src"
    4141server_arch     = "fedora.stable"
    42 openafs_url     = "http://dl.openafs.org/dl/openafs/1.4.14/openafs-1.4.14-1.1.1.src.rpm"
    43 #openafs_url    = "http://web.mit.edu/~scripts/rpm-fc13/openafs-1.4.12.1-1.0.pre3.src.rpm"
     42openafs_url     = "http://dl.openafs.org/dl/openafs/candidate/1.6.0pre6/openafs-1.6.0-0.pre6.src.rpm"
    4443zephyr_url      = "http://zephyr.1ts.org/export/HEAD/distribution/zephyr-3.0.1.tar.gz"
    4544
  • branches/fc15-dev/server/fedora/specs/openafs.spec.patch

    r1836 r1913  
    1 --- openafs.spec.orig   2010-09-10 18:21:53.000000000 -0400
    2 +++ openafs.spec        2010-09-10 18:34:30.000000000 -0400
    3 @@ -8,7 +8,7 @@
    4  # for beta/rc releases make pkgrel 0.X.<tag>
     1--- openafs.spec.orig   2011-06-20 15:32:57.000000000 -0400
     2+++ openafs.spec        2011-06-20 17:45:49.000000000 -0400
     3@@ -4,7 +4,7 @@
     4 %define pkgvers 1.6.0
     5 # for beta/rc releases make pkgrel 0.<tag>
    56 # for real releases make pkgrel 1 (or more for extra releases)
    6  #%define pkgrel 0.1.rc1
    7 -%define pkgrel 1.1
    8 +%define pkgrel 1.1.99scripts.%{scriptsversion}
     7-%define pkgrel 0.pre6
     8+%define pkgrel 0.pre6.99.scripts.%{scriptsversion}
    99 
    10  %if %{?osvers:0}%{!?osvers:1}
    11  %define osvers 1
    12 @@ -261,6 +261,19 @@
     10 %{!?fedorakmod: %define fedorakmod 1}
     11 %{!?build_dkmspkg: %define build_dkmspkg 1}
     12@@ -247,6 +247,8 @@
    1313 %endif
    1414 ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64
    1515 
    1616+Patch1000: openafs-scripts.patch
    17 +Patch1003: openafs-localcsdb.patch
    18 +Patch1005: openafs-numsysnames.patch
    19 +Patch1006: openafs-0001-Linux-Add-autoconf-macro-for-structure-checks.patch
    20 +Patch1007: openafs-0002-Linux-Add-general-autoconf-macro-for-Linux-kernel.patch
    21 +Patch1008: openafs-0003-Linux-allow-compile-flags-to-be-passed-to-AC_CHECK_L.patch
    22 +Patch1009: openafs-0004-Linux-2.6.38-Adjust-for-permission-inode-operation-c.patch
    23 +Patch1010: openafs-0005-linux-2.6.38-New-d_op-handling.patch
    24 +Patch1011: openafs-0006-linux-2.6.38-Make-d_revalidate-RCU-walk-aware.patch
    25 +Patch1012: openafs-0007-Linux-2.6.38-deal-with-dcache_lock-removal.patch
    26 +Patch1013: openafs-0008-Linux-2.6.38-dentry-d_count-is-not-an-atomic.patch
    27 +Patch1014: openafs-0009-fix-broken-earlier.patch
    2817+
    2918 #    http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/...
    3019 Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2
    3120 Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2
    32 @@ -343,6 +347,7 @@
     21@@ -326,6 +328,7 @@
    3322 %if %{build_userspace}
    3423 
     
    3827 
    3928 %if %{fedorakmod}
    40 @@ -403,6 +408,7 @@
     29@@ -386,6 +389,7 @@
    4130 
    4231 %if %{build_authlibs}
     
    4635 Group: Networking/Filesystems
    4736 
    48 @@ -419,6 +425,7 @@
     37@@ -402,6 +406,7 @@
    4938 %endif
    5039 
     
    5443 Requires: openafs-authlibs = %{version}
    5544 %endif
    56 @@ -437,6 +444,7 @@
     45@@ -420,6 +425,7 @@
    5746 libraries.
    5847 
     
    6251 Group: Development/Filesystems
    6352 
    64 @@ -465,6 +473,7 @@
     53@@ -448,6 +454,7 @@
    6554 administrators.
    6655 
     
    7059 Group: Networking/Filesystems
    7160 Provides: openafs-kernel = %{version}
    72 @@ -514,6 +523,7 @@
     61@@ -497,6 +504,7 @@
    7362 
    7463 %if %{krb5support}
     
    7867 Requires: openafs = %{version}
    7968 Group: Networking/Filesystems
    80 @@ -540,7 +550,7 @@
     69@@ -523,7 +531,7 @@
    8170 %if %{build_modules}
    8271 
     
    8776 %else
    8877 
    89 @@ -699,6 +709,18 @@
     78@@ -680,6 +688,9 @@
     79 #%setup -q -n %{srcdir}
     80 %setup -q -b 1 -n %{srcdir}
    9081 
    91  # Patch openafs to build a kernel module named "openafs" instead of "libafs"
    92  %patch0 -p1 -b .kmod26
     82+# Apply the Scripts patch
    9383+%patch1000 -p1 -b .scripts
    94 +%patch1003 -p1 -b .localcsdb
    95 +%patch1005 -p1 -b .numsysnames
    96 +%patch1006 -p1 -b .0001
    97 +%patch1007 -p1 -b .0002
    98 +%patch1008 -p1 -b .0003
    99 +%patch1009 -p1 -b .0004
    100 +%patch1010 -p1 -b .0005
    101 +%patch1011 -p1 -b .0006
    102 +%patch1012 -p1 -b .0007
    103 +%patch1013 -p1 -b .0008
    104 +%patch1014 -p1 -b .0009
    105  
     84+
    10685 ##############################################################################
    10786 #
    108 @@ -1140,7 +1140,6 @@
    109  %{_bindir}/bos
    110  %{_bindir}/fs
    111  %{_bindir}/kapasswd
    112 -%{_bindir}/kpasswd
    113  %{_bindir}/klog
    114  %{_bindir}/klog.krb
    115  %{_bindir}/pagsh
    116 
     87 # building
     88@@ -1215,6 +1226,13 @@
     89 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
     90 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*
     91 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.*
     92+%else
     93+chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so
     94+chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
     95+chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*
     96+chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.*
     97+chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so
     98+chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so.*
     99 %endif
     100 
     101 %endif
Note: See TracChangeset for help on using the changeset viewer.