X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2Flbuild-sles11;h=1c68eec52acf19a3913512b1c07865a3ae18b0a3;hb=d72e7298699c4167ace2089a01a9b2aa074aeca7;hp=995c356e93028483d1b1705517de45d806bcc218;hpb=90937a348cf0f98860b5cedcb25fded9f83d357b;p=fs%2Flustre-release.git

diff --git a/build/lbuild-sles11 b/build/lbuild-sles11
index 995c356..1c68eec 100644
--- a/build/lbuild-sles11
+++ b/build/lbuild-sles11
@@ -50,12 +50,18 @@ curl ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.17/2.6.17
 }
 
 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