LU-11790 ldiskfs: add terminating u32 when expanding inodes

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

diff --git a/contrib/lbuild/find_linux_rpms b/contrib/lbuild/find_linux_rpms
index 94fd400..8a28154 100644 (file)
--- a/contrib/lbuild/find_linux_rpms
+++ b/contrib/lbuild/find_linux_rpms
@@ -7,7 +7,12 @@
 #exec 3>&1; STDOUT=3
 STDOUT=2
 
-. ${0%/find_linux_rpms}/funcs.sh
+# Assume that lbuild's support files can be found in the same
+# canonicalized path as this very script.
+THIS_SCRIPT=$(readlink -f ${0})
+LBUILD_DIR=${LBUILD_DIR:-$(dirname ${THIS_SCRIPT})}
+
+. $LBUILD_DIR/funcs.sh
 
 TOPDIR=$PWD
 
@@ -15,8 +20,15 @@ TOPDIR=$PWD
 KERNELRPMSDIR="$1"
 
 DISTRO=$(autodetect_distro)
-
-source ${0%/*}/lbuild-$DISTRO
+# remove separator
+DISTRO=${DISTRO/-/}
+DISTROMAJ=${DISTRO%%.*}
+
+if [ -f $LBUILD_DIR/lbuild-$DISTRO ]; then
+    . $LBUILD_DIR/lbuild-$DISTRO
+else
+    . $LBUILD_DIR/lbuild-$DISTROMAJ
+fi
 
 TARGET_ARCH="$(uname -m)"
 TARGET_ARCHS="$(uname -m)"