Changeset 1625


Ignore:
Timestamp:
Sep 8, 2010, 9:32:29 PM (11 years ago)
Author:
ezyang
Message:
Upgrade OpenAFS to 1.4.12 for newest Fedora 13 kernel (could
not use old version because it did not support the new kernel;
some header files were moved around.)
Location:
branches/fc13-dev/server
Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • branches/fc13-dev/server/common/patches/openafs-scripts.patch

    r1509 r1625  
    134134--- openafs-1.4/src/afs/afs_osi_pag.c
    135135+++ openafs-1.4+scripts/src/afs/afs_osi_pag.c
    136 @@ -51,6 +51,8 @@
     136@@ -49,6 +49,8 @@
    137137 #endif
    138138 /* Local variables */
     
    143143  * Pags are implemented as follows: the set of groups whose long
    144144  * representation is '41XXXXXX' hex are used to represent the pags.
    145 @@ -458,6 +460,15 @@
     145@@ -449,6 +451,15 @@
    146146        av->uid = acred->cr_ruid;       /* default when no pag is set */
    147147 #endif
     
    156156+    }
    157157+
    158      av->initd = 0;
    159158     return 0;
    160159 }
     160 
    161161diff -ur openafs-1.4/src/afs/afs_pioctl.c openafs-1.4+scripts/src/afs/afs_pioctl.c
    162162--- openafs-1.4/src/afs/afs_pioctl.c
  • branches/fc13-dev/server/fedora/Makefile

    r1622 r1625  
    4040server_url      = "http://web.mit.edu/scripts/src"
    4141server_arch     = "fedora.stable"
    42 openafs_url     = "http://dl.openafs.org/dl/openafs/1.4.11/openafs-1.4.11-1.1.1.src.rpm"
     42openafs_url     = "http://dl.openafs.org/dl/openafs/1.4.12/openafs-1.4.12-1.1.2.src.rpm"
    4343clusterglue_url = "http://kojipkgs.fedoraproject.org/packages/cluster-glue/1.0/0.11.b79635605337.hg.fc12/src/cluster-glue-1.0-0.11.b79635605337.hg.fc12.src.rpm"
    4444heartbeat_url   = "http://kojipkgs.fedoraproject.org/packages/heartbeat/3.0.0/0.5.0daab7da36a8.hg.fc12/src/heartbeat-3.0.0-0.5.0daab7da36a8.hg.fc12.src.rpm"
  • branches/fc13-dev/server/fedora/specs/openafs.spec.patch

    r1555 r1625  
    1 --- openafs.spec.orig
    2 +++ openafs.spec
     1--- openafs.spec.orig   2010-06-01 08:47:21.000000000 -0400
     2+++ openafs.spec        2010-09-08 20:46:41.000000000 -0400
    33@@ -8,7 +8,7 @@
    44 # for beta/rc releases make pkgrel 0.X.<tag>
    55 # for real releases make pkgrel 1 (or more for extra releases)
    66 #%define pkgrel 0.1.rc1
    7 -%define pkgrel 1.1
    8 +%define pkgrel 1.1.99scripts.%{scriptsversion}
     7-%define pkgrel 1.2
     8+%define pkgrel 1.2.99scripts.%{scriptsversion}
    99 
    1010 %if %{?osvers:0}%{!?osvers:1}
    1111 %define osvers 1
    12 @@ -261,6 +261,11 @@
     12@@ -261,6 +261,10 @@
    1313 %endif
    1414 ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64
     
    1717+Patch1003: openafs-localcsdb.patch
    1818+Patch1005: openafs-numsysnames.patch
    19 +Patch1006: openafs-release-glock.patch
    2019+
    2120 #    http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/...
     
    2726 %package client
    2827+Provides: scripts-openafs-client
    29  Requires: binutils, openafs = %{PACKAGE_VERSION}
     28 Requires: binutils, openafs = %{version}
    3029 
    3130 %if %{fedorakmod}
     
    4443+Provides: scripts-openafs-authlibs-devel
    4544 %if %{build_authlibs}
    46  Requires: openafs-authlibs = %{PACKAGE_VERSION}
     45 Requires: openafs-authlibs = %{version}
    4746 %endif
    4847@@ -437,6 +445,7 @@
     
    6160 Summary: OpenAFS Kernel Module source tree
    6261 Group: Networking/Filesystems
    63  Provides: openafs-kernel = %{PACKAGE_VERSION}
     62 Provides: openafs-kernel = %{version}
    6463@@ -514,6 +524,7 @@
    6564 
     
    6867+Provides: scripts-openafs-krb5
    6968 Summary: OpenAFS programs to use with krb5
    70  Requires: openafs = %{PACKAGE_VERSION}
     69 Requires: openafs = %{version}
    7170 Group: Networking/Filesystems
    7271@@ -540,7 +551,7 @@
     
    7978 %else
    8079 
    81 @@ -699,6 +710,10 @@
     80@@ -699,6 +710,9 @@
    8281 
    8382 # Patch openafs to build a kernel module named "openafs" instead of "libafs"
     
    8685+%patch1003 -p1 -b .localcsdb
    8786+%patch1005 -p1 -b .numsysnames
    88 +%patch1006 -p1 -b .release-glock
    8987 
    9088 ##############################################################################
    9189 #
    92 @@ -1209,7 +1224,7 @@
    93  rm -rf $RPM_BUILD_ROOT%{_sbindir}/kdump*
    94  
    95  # remove man pages from programs deleted above
    96 -for f in 1/dlog 1/dpass 1/livesys 1/xstat_cm_test 1/xstat_fs_test 8/kdb 8/kpwvalid 8/xfs_size_check 1/package_test 5/package 8/package ; do
    97 +for f in 1/compile_et 1/dlog 1/dpass 1/livesys 1/xstat_cm_test 1/xstat_fs_test 8/kdb 8/kpwvalid 8/xfs_size_check 1/package_test 5/package 8/package ; do
    98    rm -f $RPM_BUILD_ROOT%{_mandir}/man$f.*
    99  done
    100  
    101 @@ -1569,7 +1584,6 @@
    102  %{_libdir}/librxstat.a
    103  %{_libdir}/libubik.a
    104  %{_mandir}/man1/rxgen.*
    105 -%{_mandir}/man1/compile_et.*
    106  
    107  %if %{build_dkmspkg}
    108  %files -n dkms-%{name}
Note: See TracChangeset for help on using the changeset viewer.