X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=contrib%2Flbuild%2Flbuild-sles11;h=6d37a857a9376ae1631d340045dac6ea1044b201;hb=530763d717189fd57c48b352ba4d13a751a2ba64;hp=bed32e9000b0a015a5ad5d5a2ee95d011f614d14;hpb=122674f13f952bab921259da02581c0e57af245e;p=fs%2Flustre-release.git

diff --git a/contrib/lbuild/lbuild-sles11 b/contrib/lbuild/lbuild-sles11
index bed32e9..6d37a85 100644
--- a/contrib/lbuild/lbuild-sles11
+++ b/contrib/lbuild/lbuild-sles11
@@ -5,9 +5,9 @@
 # build on all distributions, update the BUILD_GEN variable in build/lbuild)
 BUILD_GEN+=".0"
 
-# This distro does not support zfs, so define ZFSNOTSUPPORTED
+# This distro does not support zfs, so define WITH_ZFS
 # use words that make the bash log readable.
-ZFSNOTSUPPORTED="Zfs Not Supported"
+WITH_ZFS="Zfs Not Supported"
 
 source ${LBUILD_DIR}/lbuild-sles
 
@@ -90,7 +90,7 @@ unpack_linux_devel_rpm-sles11() {
 find_linux_rpm-sles11() {
     local prefix="$1"
     local wanted_kernel="$2"
-    local pathtorpms=${3:-"${KERNELRPMSBASE}/${lnxmaj}/${DISTRO}/${TARGET_ARCH}"}
+    local pathtorpms=${3:-"$KERNELRPMSBASE/$lnxmaj/$DISTROMAJ/$TARGET_ARCH"}
 
     local PLEV=$(sed -n -e 's/^PATCHLEVEL = //p' /etc/SuSE-release)
     local site="https://nu.novell.com/repo/\$RCE/SLES11-SP${PLEV}-Updates/sle-11-$(resolve_arch $TARGET_ARCH)/rpm/$(resolve_arch $TARGET_ARCH)"