LU-12561 build: Remove old lbuild entries

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

diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild
index 13c7d92..6a1ab0a 100755 (executable)
--- a/contrib/lbuild/lbuild
+++ b/contrib/lbuild/lbuild
@@ -29,7 +29,7 @@ push_exit_trap "kill -INT -$$ || true" kill_children
 
 # increment this if you have made a change that should force a new kernel
 # to build built
-BUILD_GEN=8
+BUILD_GEN=9
 
 TOPDIR="$PWD"
 
@@ -71,6 +71,7 @@ DISTRO=
 KERNELTREE=
 # default to not adding -lustre- into the kernel RPM package names
 KERNEL_LUSTRE_NAMING=false
+ENABLE_KERNEL_DEBUG=false
 # default not use kabi check.
 USE_KABI=false
 
@@ -157,6 +158,9 @@ Usage: ${0##*/} [OPTION]... [-- <lustre configure options>]
     Directory containing dirs with Linux source tarballs referenced by target
     files. Dir names in format kernel version ('2.6.9', etc.)
 
+  --enable-kernel-debug
+    Build with kernel-<version>.config-debug instead
+
   --linux=LINUX --with-linux=LINUX
     Directory of Linux kernel sources.  When this option is used, only
     Lustre modules and userspace are built.
@@ -313,41 +317,15 @@ check_options() {
         3.12-sles12 | 4.4-sles12)
             CANONICAL_TARGET="sles12"
             ;;
+        4.18-rhel8*)
+            CANONICAL_TARGET="rhel8"
+            ;;
         3.10-rhel7*)
             CANONICAL_TARGET="rhel7"
             ;;
-        2.6-rhel6*)
-            CANONICAL_TARGET="rhel6"
-            ;;
-        2.6-rhel5)
-            CANONICAL_TARGET="rhel5"
-            ;;
-        2.6-rhel4)
-            CANONICAL_TARGET="rhel-2.6"
-            ;;
-        2.6-suse)
-            CANONICAL_TARGET="sles-2.6"
-            ;;
-        2.6-sles10)
-            CANONICAL_TARGET="sles10-2.6"
-            ;;
-        2.6-sles11 | 3.0-sles11)
+        3.0-sles11)
             CANONICAL_TARGET="sles11"
             ;;
-        2.6-oel5)
-            CANONICAL_TARGET="oel5"
-            ;;
-        hp_pnnl-2.4)
-            CANONICAL_TARGET="hp-pnnl-2.4"
-            ;;
-        2.6-vanilla \
-            | suse-2.4.21-2 \
-            | rh-2.4 \
-            | rhel-2.4 \
-            | sles-2.4 \
-            | 2.6-patchless)
-                CANONICAL_TARGET="$TARGET"
-                ;;
     esac
 
     local timestampnodig=$(echo $TIMESTAMP | sed -e s/[0-9]*//g)
@@ -713,9 +691,15 @@ load_target() {
         XENPOSTFIX="-xen"
     fi
 
-    if [ -f $TOPDIR/lustre/lustre/kernel_patches/kernel_configs/kernel-$lnxmaj-$TARGET-$TARGET_ARCH.config ]; then
-        CONFIG_FILE="$TOPDIR/lustre/lustre/kernel_patches/kernel_configs/kernel-$lnxmaj-$TARGET$XENPOSTFIX-$TARGET_ARCH.config"
-    fi
+       if $ENABLE_KERNEL_DEBUG; then
+               if [ -f $TOPDIR/lustre/lustre/kernel_patches/kernel_configs/kernel-$lnxmaj-$TARGET-$TARGET_ARCH.config-debug ]; then
+                       CONFIG_FILE="$TOPDIR/lustre/lustre/kernel_patches/kernel_configs/kernel-$lnxmaj-$TARGET$XENPOSTFIX-$TARGET_ARCH.config-debug"
+               fi
+       else
+               if [ -f $TOPDIR/lustre/lustre/kernel_patches/kernel_configs/kernel-$lnxmaj-$TARGET-$TARGET_ARCH.config ]; then
+                       CONFIG_FILE="$TOPDIR/lustre/lustre/kernel_patches/kernel_configs/kernel-$lnxmaj-$TARGET$XENPOSTFIX-$TARGET_ARCH.config"
+               fi
+       fi
 
     local lnxrelnew=${lnxrel//-/_}
 
@@ -1945,7 +1929,7 @@ set -E
 [ -r ~/.lbuildrc ] && . ~/.lbuildrc
 
 options=$(getopt -o D:h -l kerneltree:,distro:,kernelrpm:,reusebuild:,\
-patchless,patchless-server,ccache,norpm,external-patches:,timestamp:,\
+patchless,patchless-server,enable-kernel-debug,ccache,norpm,external-patches:,timestamp:,\
 extraversion:,kerneldir:,linux:,lustre:,nodownload,nosrc,noiokit,ofed-type:,\
 ofed-version:,mlnx-version:,ofed-src:,publish,disable-zfs,release,set-value:,\
 src,stage:,target:,with-linux:,xen -- "$@")
@@ -2021,6 +2005,10 @@ while [ "$1" ]; do
                PATCHLESS_SERVER=true
                shift
                ;;
+       --enable-kernel-debug)
+               ENABLE_KERNEL_DEBUG=true
+               shift
+               ;;
         --kernelrpm)
             if ! KERNELRPMSBASE=$(canon_path "$2"); then
                 fatal 1 "Could not determine the canonical location of $2"