From 781245e83844be406c82a3f1db31ed57c41bd961 Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Thu, 22 Apr 2010 17:56:25 +0100 Subject: [PATCH] Linux: RedHat packaging updates for RHEL6 Update our bundled spec file and related tools so they can be used to build OpenAFS on the RHEL6 beta. - Make kmodtool recognise el6 as having "modern" kernel naming conventions - Replace %{PACKAGE_VERSION} (which seems to have disappeared) with the standard %{version} macro Thanks to billings and phalenor on IRC for their testing efforts. Reviewed-on: http://gerrit.openafs.org/1806 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear (cherry picked from commit 0d0e7699c9f789214205fe6837cded1a4c95f9c0) Reviewed-on: http://gerrit.openafs.org/2638 Tested-by: Andrew Deason Tested-by: BuildBot Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear (cherry picked from commit 41040638e23be43e260f79a4694df528244ef38b) Change-Id: Ia2d1d1c377d7df0a4e7bdd22ac5f86c7253ffa66 Reviewed-on: http://gerrit.openafs.org/3515 Reviewed-by: Simon Wilkinson --- src/packaging/RedHat/openafs-kmodtool | 7 ++++-- src/packaging/RedHat/openafs.spec.in | 32 +++++++++++++-------------- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/packaging/RedHat/openafs-kmodtool b/src/packaging/RedHat/openafs-kmodtool index d776cfd27..63cb9d505 100644 --- a/src/packaging/RedHat/openafs-kmodtool +++ b/src/packaging/RedHat/openafs-kmodtool @@ -40,6 +40,7 @@ get_verrel () verrel=${1:-$(uname -r)} verrel=${verrel%%$knownvariants} case "$verrel" in + *.el6*) verrel="`echo ${verrel} | sed -e 's/^\(.*.el6[^\.]*\)\.[^\.]\+.\?$/\1/'`" ;; *.fc9*) verrel="`echo ${verrel} | sed -e 's/^\(.*.fc9[^\.]*\)\.[^\.]\+.\?$/\1/'`" ;; *.fc1?*) verrel="`echo ${verrel} | sed -e 's/^\(.*.fc1[0-9][^\.]*\)\.[^\.]\+.\?$/\1/'`" ;; esac @@ -71,13 +72,15 @@ get_rpmtemplate () local variant="${1}" local dashvariant="${variant:+-${variant}}" case "$verrel" in + *.el6*) kdep="kernel-%{_target_cpu} = ${verrel}${variant}" ;; *.EL*) kdep="kernel${dashvariant}-%{_target_cpu} = ${verrel}" ;; *) kdep="kernel-%{_target_cpu} = ${verrel}${variant}" ;; esac case "$verrel" in - *.fc9*) kname="${verrel}.%{_target_cpu}${variant:+.${variant}}" ;; + *.el6*) kname="${verrel}.%{_target_cpu}${variant:+.${variant}}" ;; + *.fc9*) kname="${verrel}.%{_target_cpu}${variant:+.${variant}}" ;; *.fc1?*) kname="${verrel}.%{_target_cpu}${variant:+.${variant}}" ;; - *) kname="${verrel}${variant}" ;; + *) kname="${verrel}${variant}" ;; esac cat <= %{version} @@ -359,7 +359,7 @@ This package provides basic client support to mount and manipulate AFS. %package server -Requires: openafs = %{PACKAGE_VERSION} +Requires: openafs = %{version} Summary: OpenAFS Filesystem Server Group: Networking/Filesystems @@ -376,9 +376,9 @@ Cell. %package -n dkms-%{name} Summary: DKMS-ready kernel source for AFS distributed filesystem Group: Development/Kernel -Provides: openafs-kernel = %{PACKAGE_VERSION} +Provides: openafs-kernel = %{version} %if %{fedorakmod} -Provides: %{name}-kmod = %{PACKAGE_VERSION} +Provides: %{name}-kmod = %{version} %endif Requires(pre): dkms Requires(pre): flex @@ -414,9 +414,9 @@ authentication may link against them. %package authlibs-devel %if %{build_authlibs} -Requires: openafs-authlibs = %{PACKAGE_VERSION} +Requires: openafs-authlibs = %{version} %endif -Requires: openafs-devel = %{PACKAGE_VERSION} +Requires: openafs-devel = %{version} Summary: OpenAFS shared library development Group: Development/Filesystems @@ -446,7 +446,7 @@ shared libraries. %package docs Summary: OpenAFS user and administrator documentation -Requires: openafs = %{PACKAGE_VERSION} +Requires: openafs = %{version} Group: Networking/Filesystems %description docs @@ -461,9 +461,9 @@ administrators. %package kernel-source Summary: OpenAFS Kernel Module source tree Group: Networking/Filesystems -Provides: openafs-kernel = %{PACKAGE_VERSION} +Provides: openafs-kernel = %{version} %if %{fedorakmod} -Provides: %{name}-kmod = %{PACKAGE_VERSION} +Provides: %{name}-kmod = %{version} %endif %description kernel-source @@ -477,7 +477,7 @@ module. %package compat Summary: OpenAFS client compatibility symlinks -Requires: openafs = %{PACKAGE_VERSION}, openafs-client = %{PACKAGE_VERSION} +Requires: openafs = %{version}, openafs-client = %{version} Group: Networking/Filesystems Obsoletes: openafs-client-compat @@ -509,7 +509,7 @@ you are using KAserver instead of Krb5. %if %{krb5support} %package krb5 Summary: OpenAFS programs to use with krb5 -Requires: openafs = %{PACKAGE_VERSION} +Requires: openafs = %{version} Group: Networking/Filesystems BuildRequires: krb5-devel @@ -548,7 +548,7 @@ krb4 lookalike services. Summary: OpenAFS Kernel Module (compiled for UP) Release: %{modpkgrel} Group: Networking/Filesystems -Provides: openafs-kernel = %{PACKAGE_VERSION} +Provides: openafs-kernel = %{version} %if %{kprovidesarch} Requires: kernel-%{_target_cpu} = %{kversion} %else @@ -568,7 +568,7 @@ This package provides a precompiled AFS kernel module for %{kernvers}. %package kernel-smp Summary: OpenAFS Kernel Module (compiled for SMP) Release: %{modpkgrel} -Provides: openafs-kernel = %{PACKAGE_VERSION} +Provides: openafs-kernel = %{version} %if %{kprovidesarch} Requires: kernel-smp-%{_target_cpu} = %{kversion} %else @@ -589,7 +589,7 @@ This package provides a precompiled AFS kernel module for %{kernvers}. %package kernel-largesmp Summary: OpenAFS Kernel Module (compiled for LARGESMP) Release: %{modpkgrel} -Provides: openafs-kernel = %{PACKAGE_VERSION} +Provides: openafs-kernel = %{version} %if %{kprovidesarch} Requires: kernel-largesmp-%{_target_cpu} = %{kversion} %else @@ -610,7 +610,7 @@ This package provides a precompiled AFS kernel module for %{kernvers}. %package kernel-bigmem Summary: OpenAFS Kernel Module (compiled for SMP & big memory support) Release: %{modpkgrel} -Provides: openafs-kernel = %{PACKAGE_VERSION} +Provides: openafs-kernel = %{version} %if %{kprovidesarch} Requires: kernel-bigmem-%{_target_cpu} = %{kversion} %else @@ -631,7 +631,7 @@ This package provides a precompiled AFS kernel module for %{kernvers}. %package kernel-hugemem Summary: OpenAFS Kernel Module (compiled for SMP & huge memory support) Release: %{modpkgrel} -Provides: openafs-kernel = %{PACKAGE_VERSION} +Provides: openafs-kernel = %{version} %if %{kprovidesarch} Requires: kernel-hugemem-%{_target_cpu} = %{kversion} %else -- 2.39.5