Changeset 2659 for trunk/server/fedora


Ignore:
Timestamp:
Dec 22, 2014, 12:07:50 AM (8 years ago)
Author:
andersk
Message:
OpenAFS: upgrade to 1.6.11pre1, plus patch for d_alias change
Location:
trunk/server/fedora
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/server/fedora/Makefile

    r2637 r2659  
    4141
    4242dload           = ${PWD}/.dload
    43 openafs_url     = "https://www.openafs.org/dl/openafs/1.6.10/openafs-1.6.10-2.src.rpm"
     43openafs_url     = "http://www.openafs.org/dl/openafs/candidate/1.6.11pre1/openafs-1.6.11-0.pre1.src.rpm"
    4444#zephyr_url     = "http://zephyr.1ts.org/files/zephyr-3.0.2.tar.gz"
    4545
  • trunk/server/fedora/specs/openafs.spec.patch

    r2655 r2659  
    22+++ openafs.spec        2014-05-25 21:16:27.836268275 -0400
    33@@ -4,7 +4,7 @@
    4  %define pkgvers 1.6.10
     4 %define pkgvers 1.6.11
    55 # for beta/rc releases make pkgrel 0.<tag>
    66 # for real releases make pkgrel 1 (or more for extra releases)
    7 -%define pkgrel 2
    8 +%define pkgrel 2.99.scripts.%{scriptsversion}
     7-%define pkgrel 0.pre1
     8+%define pkgrel 0.pre1.99.scripts.%{scriptsversion}
    99 
    1010 %{!?fedorakmod: %define fedorakmod 1}
    1111 %{!?build_dkmspkg: %define build_dkmspkg 1}
    12 @@ -249,9 +249,21 @@
     12@@ -249,9 +249,18 @@
    1313 %if %{build_modules}
    1414 BuildRequires: kernel-devel
     
    1919 
    2020+Patch1000: openafs-scripts.patch
    21 +Patch1002: openafs-systemd-crond.patch
    2221+Patch1003: openafs-systemd-csdb.patch
    23 +Patch1004: openafs-afs_lookup-return.patch
    24 +Patch1005: openafs-d_revalidate-mtpt.patch
    25 +Patch1006: openafs-linux-3.17.patch
    2622+Patch1007: openafs-mvid-NULL-deref.patch
    2723+Patch1008: openafs-afs_conn-overcounts.patch
    2824+Patch1009: openafs-d_splice_alias-reference.patch
     25+Patch1010: openafs-d_u.d_alias.patch
    2926+%define _default_patch_fuzz 2
    3027+
     
    9794 %else
    9895 
    99 @@ -698,6 +712,17 @@
     96@@ -698,6 +712,14 @@
    10097 #%setup -q -n %{srcdir}
    10198 %setup -q -b 1 -n %{srcdir}
     
    103100+# Apply the Scripts patch
    104101+%patch1000 -p1 -b .scripts
    105 +%patch1002 -p1 -b .systemd-crond
    106102+%patch1003 -p1 -b .systemd-csdb
    107 +%patch1004 -p1 -b .afs_lookup-return
    108 +%patch1005 -p1 -b .d_revalidate-mtpt
    109 +%patch1006 -p1 -b .linux-3.17
    110103+%patch1007 -p1 -b .mvid-NULL-deref.patch
    111104+%patch1008 -p1 -b .afs_conn-overcounts.patch
    112105+%patch1009 -p1 -b .d_splice_alias-reference
     106+%patch1010 -p1 -b .d_u.d_alias
    113107+
    114108 ##############################################################################
Note: See TracChangeset for help on using the changeset viewer.