LU-12403 build: add support for RHEL/CentOS 8

Add RHEL/CentOS 8 to Distro, reuse the RHEL 7 spec.

Change-Id: Ic0fa915d1145ffc04bd5f6f7e3531b892a3d004a
Signed-off-by: Li Dongyang <dongyangli@ddn.com>
Reviewed-on: https://review.whamcloud.com/35168
Tested-by: Jenkins
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>

diff --git a/.gitignore b/.gitignore
index 7b13a21..8f06b07 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -56,7 +56,7 @@ e2fsck/tst_refcount
 e2fsck/tst_region
 e2fsprogs-RHEL-6.spec
 e2fsprogs-SUSE_LINUX-11+12.spec
-e2fsprogs-RHEL-7.spec
+e2fsprogs-RHEL-7+8.spec
 ext2ed/ext2ed.conf
 ext2ed/ext2ed.8
 intl/charset.alias

diff --git a/Makefile.in b/Makefile.in
index 1a464b5..7de9165 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -59,10 +59,10 @@ e2fsprogs-RHEL-6.spec: $(DEP_SUBSTITUTE) e2fsprogs-RHEL-6.spec.in
 e2fsprogs-SUSE_LINUX-11+12.spec: $(DEP_SUBSTITUTE) e2fsprogs-SUSE_LINUX-11+12.spec.in
        cd $(top_builddir); CONFIG_FILES=./e2fsprogs-SUSE_LINUX-11+12.spec ./config.status
 
-e2fsprogs-RHEL-7.spec: $(DEP_SUBSTITUTE) e2fsprogs-RHEL-7.spec.in
-       cd $(top_builddir); CONFIG_FILES=./e2fsprogs-RHEL-7.spec ./config.status
+e2fsprogs-RHEL-7+8.spec: $(DEP_SUBSTITUTE) e2fsprogs-RHEL-7+8.spec.in
+       cd $(top_builddir); CONFIG_FILES=./e2fsprogs-RHEL-7+8.spec ./config.status
 
-rpm: e2fsprogs-RHEL-6.spec e2fsprogs-SUSE_LINUX-11+12.spec e2fsprogs-RHEL-7.spec
+rpm: e2fsprogs-RHEL-6.spec e2fsprogs-SUSE_LINUX-11+12.spec e2fsprogs-RHEL-7+8.spec
        sh contrib/build-rpm
 
 docs:

diff --git a/configure b/configure
index 6172864..8faba92 100755 (executable)
--- a/configure
+++ b/configure
@@ -12687,7 +12687,7 @@ fi
 for i in MCONFIG Makefile \
        e2fsprogs-RHEL-6.spec \
        e2fsprogs-SUSE_LINUX-11+12.spec \
-       e2fsprogs-RHEL-7.spec \
+       e2fsprogs-RHEL-7+8.spec \
        util/Makefile util/subst.conf util/gen-tarball util/install-symlink \
        lib/et/Makefile lib/ss/Makefile lib/e2p/Makefile \
        lib/ext2fs/Makefile lib/ext2fs/ext2_types.h \

diff --git a/configure.ac b/configure.ac
index e02680c..6c54d59 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1805,7 +1805,7 @@ fi
 for i in MCONFIG Makefile \
        e2fsprogs-RHEL-6.spec \
        e2fsprogs-SUSE_LINUX-11+12.spec \
-       e2fsprogs-RHEL-7.spec \
+       e2fsprogs-RHEL-7+8.spec \
        util/Makefile util/subst.conf util/gen-tarball util/install-symlink \
        lib/et/Makefile lib/ss/Makefile lib/e2p/Makefile \
        lib/ext2fs/Makefile lib/ext2fs/ext2_types.h \

diff --git a/contrib/build-rpm b/contrib/build-rpm
index af2e4a0..533cb6c 100644 (file)
--- a/contrib/build-rpm
+++ b/contrib/build-rpm
@@ -68,14 +68,17 @@ if [ -z "$RELEASE" ]; then
 fi
 case "$DISTRO-$RELEASE" in
     Scientific-6*) DISTRO=RHEL; RELEASE=6;;
-    Scientific-7*) DISTRO=RHEL; RELEASE=7;;
+    Scientific-7*) DISTRO=RHEL; RELEASE=7+8;;
     RedHatEnterpriseServer-6*) DISTRO=RHEL; RELEASE=6;;
-    RedHatEnterpriseServer-7*) DISTRO=RHEL; RELEASE=7;;
+    RedHatEnterpriseServer-7*) DISTRO=RHEL; RELEASE=7+8;;
+    RedHatEnterprise-8*) DISTRO=RHEL; RELEASE=7+8;;
     CentOS-6*) DISTRO=RHEL; RELEASE=6;;
-    CentOS-7*) DISTRO=RHEL; RELEASE=7;;
+    CentOS-7*) DISTRO=RHEL; RELEASE=7+8;;
+    CentOS-8*) DISTRO=RHEL; RELEASE=7+8;;
     Fedora-1[1-4]) DISTRO=RHEL; RELEASE=6;;    # use the same .spec for now
-    Fedora-1[5-9]) DISTRO=RHEL; RELEASE=7;;
-    Fedora-2[0-9]) DISTRO=RHEL; RELEASE=7;;
+    Fedora-1[5-9]) DISTRO=RHEL; RELEASE=7+8;;
+    Fedora-2[0-9]) DISTRO=RHEL; RELEASE=7+8;;
+    Fedora-3[0-9]) DISTRO=RHEL; RELEASE=7+8;;
     SUSE\ LINUX-1[1-2]* | SUSE-12*) DISTRO=SUSE_LINUX; RELEASE=11+12;;
 esac
 

diff --git a/e2fsprogs-RHEL-7.spec.in b/e2fsprogs-RHEL-7+8.spec.in
similarity index 100%
rename from e2fsprogs-RHEL-7.spec.in
rename to e2fsprogs-RHEL-7+8.spec.in