ba2ae35d8f
Add systemd support for o2cb and ocfs2 service. 1. I've tested changes on opensuse13.2 and sle12 sp1. It works well. 2. Backforward compatible. 3. It will be added into sle12 once it become mature in opensuse. OBS-URL: https://build.opensuse.org/request/show/330115 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=84
164 lines
3.9 KiB
Diff
164 lines
3.9 KiB
Diff
From: Junxiao Bi <junxiao.bi@oracle.com>
|
|
To: <ocfs2-tools-devel@oss.oracle.com>
|
|
Date: 6/29/2015 4:29 PM
|
|
Subject: [Ocfs2-tools-devel] [PATCH 1/6] ocfs2-tools: add build scripts for rhel7
|
|
|
|
Signed-off-by: Junxiao Bi <junxiao.bi@oracle.com>
|
|
---
|
|
vendor/Makefile | 2 +-
|
|
vendor/rhel7/Makefile | 10 +++++++
|
|
vendor/rhel7/Vendor.make | 10 +++++++
|
|
vendor/rhel7/rpmarch.guess | 68 ++++++++++++++++++++++++++++++++++++++++++++
|
|
vendor/rhel7/vendor.guess | 13 +++++++++
|
|
5 files changed, 102 insertions(+), 1 deletion(-)
|
|
create mode 100644 vendor/rhel7/Makefile
|
|
create mode 100644 vendor/rhel7/Vendor.make
|
|
create mode 100755 vendor/rhel7/rpmarch.guess
|
|
create mode 100755 vendor/rhel7/vendor.guess
|
|
|
|
diff --git a/vendor/Makefile b/vendor/Makefile
|
|
index 8819586..58ac84d 100644
|
|
--- a/vendor/Makefile
|
|
+++ b/vendor/Makefile
|
|
@@ -2,6 +2,6 @@ TOPDIR = ..
|
|
|
|
include $(TOPDIR)/Preamble.make
|
|
|
|
-SUBDIRS = common rhel6 rhel5 sles10 rhel4 sles9 fc7 fc8 fc9
|
|
+SUBDIRS = common rhel7 rhel6 rhel5 sles10 rhel4 sles9 fc7 fc8 fc9
|
|
|
|
include $(TOPDIR)/Postamble.make
|
|
diff --git a/vendor/rhel7/Makefile b/vendor/rhel7/Makefile
|
|
new file mode 100644
|
|
index 0000000..7afe47c
|
|
--- /dev/null
|
|
+++ b/vendor/rhel7/Makefile
|
|
@@ -0,0 +1,10 @@
|
|
+TOPDIR = ../..
|
|
+
|
|
+include $(TOPDIR)/Preamble.make
|
|
+
|
|
+DIST_FILES = \
|
|
+ rpmarch.guess \
|
|
+ Vendor.make \
|
|
+ vendor.guess
|
|
+
|
|
+include $(TOPDIR)/Postamble.make
|
|
diff --git a/vendor/rhel7/Vendor.make b/vendor/rhel7/Vendor.make
|
|
new file mode 100644
|
|
index 0000000..b8fc25e
|
|
--- /dev/null
|
|
+++ b/vendor/rhel7/Vendor.make
|
|
@@ -0,0 +1,10 @@
|
|
+#
|
|
+# RHEL 7
|
|
+#
|
|
+
|
|
+TOOLSARCH = $(shell $(TOPDIR)/vendor/rhel7/rpmarch.guess tools $(TOPDIR))
|
|
+VENDOR_EXTENSION = el7
|
|
+
|
|
+include $(TOPDIR)/vendor/common/Vendor.make
|
|
+
|
|
+packages: rpm
|
|
diff --git a/vendor/rhel7/rpmarch.guess b/vendor/rhel7/rpmarch.guess
|
|
new file mode 100755
|
|
index 0000000..8519589
|
|
--- /dev/null
|
|
+++ b/vendor/rhel7/rpmarch.guess
|
|
@@ -0,0 +1,68 @@
|
|
+#! /bin/sh
|
|
+
|
|
+mode="$1"
|
|
+srcdir="$2"
|
|
+
|
|
+host_cpu=
|
|
+
|
|
+
|
|
+QUERYFILE=/etc/redhat-release
|
|
+
|
|
+if test -n "$QUERYFILE"; then
|
|
+ host_cpu="`rpm -qf $QUERYFILE --queryformat \"%{ARCH}\"`"
|
|
+fi
|
|
+
|
|
+if test -z "$host_cpu" -o "$host_cpu" = "noarch" ; then
|
|
+ host_alias=`$srcdir/config.guess`
|
|
+ host=`$srcdir/config.sub $host_alias`
|
|
+ host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
|
|
+fi
|
|
+
|
|
+case "$host_cpu" in
|
|
+ x86_64|ia64|s390x)
|
|
+ TOOLSARCH="$host_cpu"
|
|
+ ;;
|
|
+ i386|i486|i586|i686|i786|k6|k7)
|
|
+ TOOLSARCH="i386"
|
|
+ ;;
|
|
+ ppc|ppc64|ppciseries|ppcpseries|ppc64iseries|ppc64pseries|powerpc|powerpc64)
|
|
+ TOOLSARCH="ppc"
|
|
+ ;;
|
|
+ *)
|
|
+ echo "rpmarch.guess: Warning: unknown RPM CPU architecture: $host_cpu" >&2
|
|
+ TOOLSARCH=""
|
|
+ ;;
|
|
+esac
|
|
+
|
|
+# Only a few of these need to be overwritten from RPM's default
|
|
+case "$host_cpu" in
|
|
+ i386|i586)
|
|
+ MODULEARCH="i686"
|
|
+ ;;
|
|
+ ppc|ppc64|ppciseries|ppcpseries|ppc64iseries|ppc64pseries|powerpc|powerpc64)
|
|
+ MODULEARCH="ppc64"
|
|
+ ;;
|
|
+ *)
|
|
+ MODULEARCH=""
|
|
+ ;;
|
|
+esac
|
|
+
|
|
+case "$mode" in
|
|
+ module)
|
|
+ if [ -n "$MODULEARCH" ] ; then
|
|
+ echo "--target $MODULEARCH"
|
|
+ fi
|
|
+ ;;
|
|
+ tools)
|
|
+ if [ -n "$TOOLSARCH" ] ; then
|
|
+ echo "--target $TOOLSARCH"
|
|
+ fi
|
|
+ ;;
|
|
+ *)
|
|
+ echo "rpmarch.guess: Invalid mode: $mode" >&2
|
|
+ echo "error"
|
|
+ exit 1
|
|
+ ;;
|
|
+esac
|
|
+
|
|
+exit 0
|
|
diff --git a/vendor/rhel7/vendor.guess b/vendor/rhel7/vendor.guess
|
|
new file mode 100755
|
|
index 0000000..c3a8b12
|
|
--- /dev/null
|
|
+++ b/vendor/rhel7/vendor.guess
|
|
@@ -0,0 +1,13 @@
|
|
+#!/bin/sh
|
|
+
|
|
+if [ ! -f /etc/redhat-release ]
|
|
+then
|
|
+ exit 1
|
|
+fi
|
|
+
|
|
+case "`rpm -qf /etc/redhat-release --qf '%{VERSION}' 2>/dev/null`" in
|
|
+ 7*) ;;
|
|
+ *) exit 1;;
|
|
+esac
|
|
+
|
|
+exit 0
|
|
--
|
|
1.7.9.5
|
|
|
|
|
|
_______________________________________________
|
|
Ocfs2-tools-devel mailing list
|
|
Ocfs2-tools-devel@oss.oracle.com
|
|
https://oss.oracle.com/mailman/listinfo/ocfs2-tools-devel
|