From: Arne Wiebalck Date: Fri, 12 Jul 2013 09:39:53 +0000 (+0200) Subject: RedHat: support building on ELRepo kernels X-Git-Tag: upstream/1.6.6^2~5 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=f101a0ab400ad8ed4359f4b2649d9998df16a042;p=packages%2Fo%2Fopenafs.git RedHat: support building on ELRepo kernels Amend the pattern matching in openafs-kmodtool to support building for kernels from ELRepo. Reviewed-on: http://gerrit.openafs.org/10083 Tested-by: BuildBot Reviewed-by: Derrick Brashear (cherry picked from commit 397a086b77c4351e5332a73ae4859faf239bf45e) Change-Id: I0f1a7126271cb7952e4369af3c93484c4b0567d0 Reviewed-on: http://gerrit.openafs.org/10703 Tested-by: BuildBot Reviewed-by: Andrew Deason Reviewed-by: Derrick Brashear Reviewed-by: Michael Meffie Reviewed-by: Stephan Wiesand --- diff --git a/src/packaging/RedHat/openafs-kmodtool b/src/packaging/RedHat/openafs-kmodtool index 63cb9d505..b136e25b1 100644 --- a/src/packaging/RedHat/openafs-kmodtool +++ b/src/packaging/RedHat/openafs-kmodtool @@ -40,9 +40,10 @@ 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/'`" ;; + *.el6.elrepo*) verrel="`echo ${verrel} | sed -e 's/^\(.*.el6.elrepo[^\.]*\)\.[^\.]\+.\?$/\1/'`" ;; + *.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 }