From 806998aa6748f445d7a21a28f51438faf158eb09 Mon Sep 17 00:00:00 2001 From: Bob Glossman Date: Thu, 16 Oct 2014 11:41:07 -0700 Subject: [PATCH] LU-5845 build: add support for SUSE_LINUX-12 .spec file Add the SLES 12 .spec file. For now SLES 12 and SLES 11 can share the same .spec file. LU-8390 build: use correct .spec file for SLES 12 Changes in output from the lsb_release command in SLES 12 resulted in using the wrong .spec file in builds. This patch corrects the problem for old and new versions. Signed-off-by: Bob Glossman Change-Id: I41d47c305eba7d3dd0d313be5ad8192592291fad Reviewed-on: http://review.whamcloud.com/21237 Reviewed-by: Andreas Dilger Tested-by: Jenkins Tested-by: Maloo Signed-off-by: Bob Glossman Change-Id: I3b716c09ea8632d2333aaf61b8a6c881ccd18a88 Reviewed-on: http://review.whamcloud.com/12316 Reviewed-by: James Simmons Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger --- .gitignore | 2 +- Makefile.in | 6 +++--- configure | 2 +- configure.ac | 2 +- contrib/build-rpm | 1 + ...rogs-SUSE_LINUX-11.spec.in => e2fsprogs-SUSE_LINUX-11+12.spec.in | 0 6 files changed, 7 insertions(+), 6 deletions(-) rename e2fsprogs-SUSE_LINUX-11.spec.in => e2fsprogs-SUSE_LINUX-11+12.spec.in (100%) diff --git a/.gitignore b/.gitignore index c005582..7b13a21 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.spec +e2fsprogs-SUSE_LINUX-11+12.spec e2fsprogs-RHEL-7.spec ext2ed/ext2ed.conf ext2ed/ext2ed.8 diff --git a/Makefile.in b/Makefile.in index 95e9aaf..5ad9b53 100644 --- a/Makefile.in +++ b/Makefile.in @@ -50,13 +50,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.spec: $(DEP_SUBSTITUTE) e2fsprogs-SUSE_LINUX-11.spec.in - cd $(top_builddir); CONFIG_FILES=./e2fsprogs-SUSE_LINUX-11.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-RHEL-7.spec: $(DEP_SUBSTITUTE) e2fsprogs-RHEL-7.spec.in cd $(top_builddir); CONFIG_FILES=./e2fsprogs-RHEL-7.spec ./config.status -rpm: e2fsprogs-RHEL-6.spec e2fsprogs-SUSE_LINUX-11.spec e2fsprogs-RHEL-7.spec +rpm: e2fsprogs-RHEL-6.spec e2fsprogs-SUSE_LINUX-11+12.spec e2fsprogs-RHEL-7.spec sh contrib/build-rpm docs: diff --git a/configure b/configure index a180961..e5e3d65 100755 --- a/configure +++ b/configure @@ -14674,7 +14674,7 @@ if test -z "$BLKID_CMT" ; then fi for i in MCONFIG Makefile \ e2fsprogs-RHEL-6.spec \ - e2fsprogs-SUSE_LINUX-11.spec \ + e2fsprogs-SUSE_LINUX-11+12.spec \ e2fsprogs-RHEL-7.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 ac5c78a..dc604b1 100644 --- a/configure.ac +++ b/configure.ac @@ -1752,7 +1752,7 @@ if test -z "$BLKID_CMT" ; then fi for i in MCONFIG Makefile \ e2fsprogs-RHEL-6.spec \ - e2fsprogs-SUSE_LINUX-11.spec \ + e2fsprogs-SUSE_LINUX-11+12.spec \ e2fsprogs-RHEL-7.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 cb8e159..038d802 100644 --- a/contrib/build-rpm +++ b/contrib/build-rpm @@ -74,6 +74,7 @@ case "$DISTRO-$RELEASE" in 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;; + SUSE\ LINUX-1[1-2]* | SUSE-12*) DISTRO=SUSE_LINUX; RELEASE=11+12;; esac SPECFILE="$currdir/e2fsprogs-${DISTRO// /_}-$RELEASE.spec" diff --git a/e2fsprogs-SUSE_LINUX-11.spec.in b/e2fsprogs-SUSE_LINUX-11+12.spec.in similarity index 100% rename from e2fsprogs-SUSE_LINUX-11.spec.in rename to e2fsprogs-SUSE_LINUX-11+12.spec.in -- 1.8.3.1