}
+# XXX this needs to be re-written as a wrapper around find_rpm
+# or just gotten rid of. :-)
find_linux_rpm() {
local prefix="$1"
local delimiter=${2:-"-"}
# call a distro specific hook, if available
if type -p unpack_linux_devel_rpm-$DISTRO; then
- unpack_linux_devel_rpm-$DISTRO
+ unpack_linux_devel_rpm-$DISTRO "$kernelrpm"
fi
popd
}
unpack_linux_devel_rpm-sles11() {
+ local callers_rpm="$1"
+
+ local rpmdir="${callers_rpm%/*}"
+
local kernelrpm
- if ! kernelrpm=$(find_rpm "$TOPDIR/RPMS/$arch/" provides "^kernel-lustre-default-base ="); then
- fatal 1 "Could not find the kernel-lustre-default-base in $TOPDIR/RPMS/$arch/"
+ # this is a hack that should go away when the modified lustre kernel
+ # Provides kernel-default-base vvvvvvvvv
+ if ! kernelrpm=$(find_rpm "$rpmdir" provides "^kernel-(lustre-)?default-base ="); then
+ fatal 1 "Could not find the kernel-default-base in $rpmdir/"
fi
- if ! rpm2cpio < "$TOPDIR/RPMS/$arch/$kernelrpm" | cpio -id > /dev/null 2>&1; then
+ if ! rpm2cpio < "$rpmdir/$kernelrpm" | cpio -id > /dev/null 2>&1; then
fatal 1 "Unpack error for $kernelrpm"
fi