redhat: Use the right path to depmod

As of Fedora 17 and RHEL 7, depmod has moved from /sbin to /usr/sbin.
The full path to depmod is used in package scripts and as a dependency.
This hasn't caused problems in most cases because on an installed
system a link /sbin -> /usr/sbin is present and during ordinary package
installations yum/rpm correctly then figure out that /sbin/depmod is
actually provided. But in other situations, the dependency check is not
that clever and (incorrectly) fails.

Add a macro to the spec defining the full path to depmod, use the macro
rather than plain /sbin/depmod throughout the spec, and also pass it to
kmodtool when required to generate the kmod package scripts and
requirements.

FIXES 131860

Change-Id: I1f2e4f7100d244477c2cb9087d2f48bbcea27fdc
Reviewed-on: http://gerrit.openafs.org/11128
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Reviewed-by: Perry Ruiter <pruiter@sinenomine.net>
Reviewed-by: D Brashear <shadow@your-file-system.com>

diff --git a/src/packaging/RedHat/openafs-kmodtool b/src/packaging/RedHat/openafs-kmodtool
index b9ae666..88d10b2 100644 (file)
--- a/src/packaging/RedHat/openafs-kmodtool
+++ b/src/packaging/RedHat/openafs-kmodtool
@@ -100,17 +100,17 @@ Provides:         ${kmod_name}-kmod = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:         openafs-kernel = %{PACKAGE_VERSION}
 Requires:         ${kdep}
 Requires:         ${kmod_name}-kmod-common >= %{?epoch:%{epoch}:}%{version}
-Requires(post):   /sbin/depmod
-Requires(postun): /sbin/depmod
+Requires(post):   ${depmod}
+Requires(postun): ${depmod}
 Release:          %{pkgrel}.%(echo ${verrel} | tr - _)
 BuildRequires:    kernel${dashvariant}-devel-%{_target_cpu} = ${verrel}
 %description   -n kmod-${kmod_name}${dashvariant}
 This package provides the ${kmod_name} kernel modules built for the Linux
 kernel ${kname} for the %{_target_cpu} family of processors.
 %post          -n kmod-${kmod_name}${dashvariant}
-/sbin/depmod -aeF /boot/System.map-${kname} ${kname} > /dev/null || :
+${depmod} -aeF /boot/System.map-${kname} ${kname} > /dev/null || :
 %postun        -n kmod-${kmod_name}${dashvariant}
-/sbin/depmod -aF /boot/System.map-${kname} ${kname} &> /dev/null || :
+${depmod} -aF /boot/System.map-${kname} ${kname} &> /dev/null || :
 %files         -n kmod-${kmod_name}${dashvariant}
 %defattr(644,root,root,755)
 /lib/modules/${kname}/extra/${kmod_name}/
@@ -125,12 +125,17 @@ print_rpmtemplate ()
   kver="${1}"
   get_verrel "${1}"
   shift
+  depmod="${1}"
+  shift
   if [ -z "${kmod_name}" ] ; then
     echo "Please provide the kmodule-name as first parameter." >&2
     exit 2
   elif [ -z "${kver}" ] ; then
     echo "Please provide the kver as second parameter." >&2
     exit 2
+  elif [ -z "${depmod}" ] ; then
+    echo "Please provide the full path to depmod as third parameter." >&2
+    exit 2
   elif [ -z "${verrel}" ] ; then
     echo "Couldn't find out the verrel." >&2
     exit 2
@@ -152,7 +157,7 @@ Usage: ${myprog} <command> <option>+
     - Get "base" version-release.
   variant <uname>                               
     - Get variant from uname.
-  rpmtemplate <mainpgkname> <uname> <variants> 
+  rpmtemplate <mainpgkname> <uname> </path/to/depmod> <variants> 
     - Return a template for
   version  
     - Output version number and exit.

diff --git a/src/packaging/RedHat/openafs.spec.in b/src/packaging/RedHat/openafs.spec.in
index ba7ebbe..dd4da6e 100644 (file)
--- a/src/packaging/RedHat/openafs.spec.in
+++ b/src/packaging/RedHat/openafs.spec.in
@@ -23,6 +23,12 @@
 %define fedorakmod 1
 %endif
 
+%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7
+%define depmod /usr/sbin/depmod
+%else
+%define depmod /sbin/depmod
+%endif
+
 %if !%{fedorakmod}
 # Determine the version of the kernel to build against
 # - automatically select running kernel if there are sources in /lib/modules
@@ -540,7 +546,7 @@ krb4 lookalike services.
 %if %{build_modules}
 
 %if %{fedorakmod}
-%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} 2>/dev/null)}
+%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{depmod} %{kvariants} 2>/dev/null)}
 
 %else
 
@@ -1443,43 +1449,43 @@ dkms remove -m %{name} -v %{dkms_version} --rpm_safe_upgrade --all ||:
 %if !%{fedorakmod}
 %if %{up_package}
 %post kernel
-/sbin/depmod -ae %{kernvers}
+%{depmod} -ae %{kernvers}
 
 %postun kernel
-/sbin/depmod -ae %{kernvers}
+%{depmod} -ae %{kernvers}
 
 %endif
 
 %if %{smp_package}
 %post kernel-smp
-/sbin/depmod -ae %{kernvers}%{?smp_ext:%{smp_ext}}
+%{depmod} -ae %{kernvers}%{?smp_ext:%{smp_ext}}
 
 %postun kernel-smp
-/sbin/depmod -ae %{kernvers}%{?smp_ext:%{smp_ext}}
+%{depmod} -ae %{kernvers}%{?smp_ext:%{smp_ext}}
 %endif
 
 %if %{largesmp_package}
 %post kernel-largesmp
-/sbin/depmod -ae %{kernvers}%{?largesmp_ext:%{largesmp_ext}}
+%{depmod} -ae %{kernvers}%{?largesmp_ext:%{largesmp_ext}}
 
 %postun kernel-largesmp
-/sbin/depmod -ae %{kernvers}%{?largesmp_ext:%{largesmp_ext}}
+%{depmod} -ae %{kernvers}%{?largesmp_ext:%{largesmp_ext}}
 %endif
  
 %if %{bigmem_package}
 %post kernel-bigmem
-/sbin/depmod -ae %{kernvers}%{?bigmem_ext:%{bigmem_ext}}
+%{depmod} -ae %{kernvers}%{?bigmem_ext:%{bigmem_ext}}
 
 %postun kernel-bigmem
-/sbin/depmod -ae %{kernvers}%{?bigmem_ext:%{bigmem_ext}}
+%{depmod} -ae %{kernvers}%{?bigmem_ext:%{bigmem_ext}}
 %endif
 
 %if %{hugemem_package}
 %post kernel-hugemem
-/sbin/depmod -ae %{kernvers}%{?hugemem_ext:%{hugemem_ext}}
+%{depmod} -ae %{kernvers}%{?hugemem_ext:%{hugemem_ext}}
 
 %postun kernel-hugemem
-/sbin/depmod -ae %{kernvers}%{?hugemem_ext:%{hugemem_ext}}
+%{depmod} -ae %{kernvers}%{?hugemem_ext:%{hugemem_ext}}
 %endif
 %endif
 %endif