From 312f26d0c9bfc7bf74e50ab3c8d7bf3a685979c6 Mon Sep 17 00:00:00 2001 From: Li Dongyang Date: Tue, 11 Jun 2019 15:05:03 +1000 Subject: [PATCH] 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 Reviewed-on: https://review.whamcloud.com/35168 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger --- .gitignore | 2 +- Makefile.in | 6 +++--- configure | 2 +- configure.ac | 2 +- contrib/build-rpm | 13 ++++++++----- e2fsprogs-RHEL-7.spec.in => e2fsprogs-RHEL-7+8.spec.in | 0 6 files changed, 14 insertions(+), 11 deletions(-) rename e2fsprogs-RHEL-7.spec.in => e2fsprogs-RHEL-7+8.spec.in (100%) diff --git a/.gitignore b/.gitignore index 7b13a21..8f06b07 100644 --- 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 5ad9b53..bab1f6e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -53,10 +53,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 7736cf4..36ec0ec 100755 --- a/configure +++ b/configure @@ -14635,7 +14635,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 dc604b1..1f183a4 100644 --- a/configure.ac +++ b/configure.ac @@ -1753,7 +1753,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 --- 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 -- 1.8.3.1