LU-2675 llapi: find_param cleanup part II

[fs/lustre-release.git] / contrib / lbuild / lbuild-sles11

diff --git a/contrib/lbuild/lbuild-sles11 b/contrib/lbuild/lbuild-sles11
index bed32e9..6d37a85 100644 (file)
--- 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)"