b=5783

r=jacob
More HP patch integration.  I will note jacob's reluctance to approve the
Requires hunk, commenting that he "fear[s] change"

Info:
        HP SFS 1550/CFS 5783

        Fix to ensure that the lustre-modules rpm is dependent on the
        kernel rpm it is built against, and also to ensure it runs
        depmod against the appropriate kernel install area to allow
        for installing the lustre-modules rpm before rebooting on the
        new kernel.

diff --git a/build/lustre.spec.in b/build/lustre.spec.in
index edddf2f..eeeae23 100644 (file)
--- a/build/lustre.spec.in
+++ b/build/lustre.spec.in
@@ -22,6 +22,7 @@ servers and utilities.
 %package -n lustre-modules
 Summary: Kernel Lustre drivers for Linux %{kversion}
 Requires: modutils >= 2.4.10
+Requires: /boot/System.map-%{kversion}
 Group: Development/Kernel
 
 %description -n lustre-modules
@@ -235,10 +236,10 @@ fi
 if [ ! -e /dev/portals ]; then
    mknod /dev/portals c 10 240
 fi
-depmod -ae || exit 0
+depmod -ae -F /boot/System.map-%{kversion} %{kversion} || exit 0
 
 %postun -n lustre-modules
-depmod -ae || exit 0
+depmod -ae -F /boot/System.map-%{kversion} %{kversion} || exit 0
 
 %clean
 #rm -rf $RPM_BUILD_ROOT