Whamcloud - gitweb
LU-7961 build: Fix ldiskfs source autodetect for CentOS 6 48/19248/3
authorBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 27 Mar 2015 17:50:09 +0000 (10:50 -0700)
committerOleg Drokin <oleg.drokin@intel.com>
Mon, 11 Jul 2016 23:56:16 +0000 (23:56 +0000)
CentOS 6 installed the kernel source in to the following path
which differs slightly from the RHEL version.  Expand the search
pattern to encompass both the CentOS and RHEL paths.

/usr/src/debug/*/linux-2.6.32-x.y.z.el6.centos.plus.x86_64

Change-Id: I0a102148f34d57b94dddfac7819303314c61a376
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-on: http://review.whamcloud.com/19248
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
config/lustre-build-ldiskfs.m4

index 2d42764..0e6a2b0 100644 (file)
@@ -274,7 +274,7 @@ AS_IF([test -e "$linux_src/fs/ext4/super.c"], [
        EXT4_SRC_DIR="$linux_src/fs/ext4"
 ], [
        # Kernel ext source provided by kernel-debuginfo-common package
-       linux_src=$(ls -1d /usr/src/debug/*/linux-$LINUXRELEASE \
+       linux_src=$(ls -1d /usr/src/debug/*/linux-${LINUXRELEASE%.*}* \
                2>/dev/null | tail -1)
        AS_IF([test -e "$linux_src/fs/ext4/super.c"],
                [EXT4_SRC_DIR="$linux_src/fs/ext4"],