From e59d2d71c8b64beedd37702ca29a2f52f1bba535 Mon Sep 17 00:00:00 2001 From: Minh Diep Date: Tue, 28 Jan 2020 14:35:46 -0800 Subject: [PATCH] LU-13177 build: add support for SLES15SP1 Add SUSE 15SP1 to distro and spec file Change-Id: Ica12ae0246db4755746ada6647122e8853fc6258 Signed-off-by: Minh Diep Reviewed-on: https://review.whamcloud.com/37357 Tested-by: jenkins Reviewed-by: Andreas Dilger Tested-by: Andreas Dilger --- .gitignore | 2 +- Makefile.in | 6 +++--- configure | 2 +- configure.ac | 2 +- contrib/build-rpm | 2 +- ...USE_LINUX-11+12.spec.in => e2fsprogs-SUSE_LINUX-11+12+15.spec.in | 0 6 files changed, 7 insertions(+), 7 deletions(-) rename e2fsprogs-SUSE_LINUX-11+12.spec.in => e2fsprogs-SUSE_LINUX-11+12+15.spec.in (100%) diff --git a/.gitignore b/.gitignore index 8f06b07..5908be0 100644 --- a/.gitignore +++ b/.gitignore @@ -55,7 +55,7 @@ e2fsck/tst_problem e2fsck/tst_refcount e2fsck/tst_region e2fsprogs-RHEL-6.spec -e2fsprogs-SUSE_LINUX-11+12.spec +e2fsprogs-SUSE_LINUX-11+12+15.spec e2fsprogs-RHEL-7+8.spec ext2ed/ext2ed.conf ext2ed/ext2ed.8 diff --git a/Makefile.in b/Makefile.in index 7de9165..a6cc91f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -56,13 +56,13 @@ all-progs-recursive all-libs-recursive:: subs e2fsprogs-RHEL-6.spec: $(DEP_SUBSTITUTE) e2fsprogs-RHEL-6.spec.in cd $(top_builddir); CONFIG_FILES=./e2fsprogs-RHEL-6.spec ./config.status -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-SUSE_LINUX-11+12+15.spec: $(DEP_SUBSTITUTE) e2fsprogs-SUSE_LINUX-11+12+15.spec.in + cd $(top_builddir); CONFIG_FILES=./e2fsprogs-SUSE_LINUX-11+12+15.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+8.spec +rpm: e2fsprogs-RHEL-6.spec e2fsprogs-SUSE_LINUX-11+12+15.spec e2fsprogs-RHEL-7+8.spec sh contrib/build-rpm docs: diff --git a/configure b/configure index 9e64d9e..07e8f8c 100755 --- a/configure +++ b/configure @@ -12696,7 +12696,7 @@ if test -z "$BLKID_CMT" ; then fi for i in MCONFIG Makefile \ e2fsprogs-RHEL-6.spec \ - e2fsprogs-SUSE_LINUX-11+12.spec \ + e2fsprogs-SUSE_LINUX-11+12+15.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 \ diff --git a/configure.ac b/configure.ac index 18e04cb..78f93a9 100644 --- a/configure.ac +++ b/configure.ac @@ -1818,7 +1818,7 @@ if test -z "$BLKID_CMT" ; then fi for i in MCONFIG Makefile \ e2fsprogs-RHEL-6.spec \ - e2fsprogs-SUSE_LINUX-11+12.spec \ + e2fsprogs-SUSE_LINUX-11+12+15.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 \ diff --git a/contrib/build-rpm b/contrib/build-rpm index 533cb6c..7bb9694 100644 --- a/contrib/build-rpm +++ b/contrib/build-rpm @@ -79,7 +79,7 @@ case "$DISTRO-$RELEASE" in 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;; + SUSE\ LINUX-1[1-5]* | SUSE-12* | SUSE-15*) DISTRO=SUSE_LINUX; RELEASE=11+12+15;; esac SPECFILE="$currdir/e2fsprogs-${DISTRO// /_}-$RELEASE.spec" diff --git a/e2fsprogs-SUSE_LINUX-11+12.spec.in b/e2fsprogs-SUSE_LINUX-11+12+15.spec.in similarity index 100% rename from e2fsprogs-SUSE_LINUX-11+12.spec.in rename to e2fsprogs-SUSE_LINUX-11+12+15.spec.in -- 1.8.3.1