[Debian-ha-commits] [ocfs2-tools] 37/58: vendor: rhel7: add build/install dep pkg

Valentin Vidic vvidic-guest at moszumanska.debian.org
Tue Jun 20 13:40:43 UTC 2017 

This is an automated email from the git hooks/post-receive script.

vvidic-guest pushed a commit to branch upstream
in repository ocfs2-tools.

commit 29ec3e5bea22f8597e45ddd0b2ee9b9619314435
Author: Junxiao Bi <junxiao.bi at oracle.com>
Date:   Wed Jul 1 10:43:25 2015 +0800

    vendor: rhel7: add build/install dep pkg
    
    Signed-off-by: Junxiao Bi <junxiao.bi at oracle.com>
    Reviewed-by: Srinivas Eeda <srinivas.eeda at oracle.com>
---
 vendor/common/Vendor.make                 | 2 ++
 vendor/common/ocfs2-tools.spec-generic.in | 4 ++--
 vendor/fc7/Vendor.make                    | 1 +
 vendor/fc8/Vendor.make                    | 1 +
 vendor/fc9/Vendor.make                    | 1 +
 vendor/rhel4/Vendor.make                  | 1 +
 vendor/rhel5/Vendor.make                  | 1 +
 vendor/rhel6/Vendor.make                  | 1 +
 vendor/rhel7/Vendor.make                  | 2 ++
 vendor/sles10/Vendor.make                 | 1 +
 vendor/sles9/Vendor.make                  | 1 +
 11 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/vendor/common/Vendor.make b/vendor/common/Vendor.make
index 2526cdc..1dcd42e 100644
--- a/vendor/common/Vendor.make
+++ b/vendor/common/Vendor.make
@@ -21,6 +21,8 @@ $(TOPDIR)/ocfs2-tools-$(DIST_VERSION)-$(PKG_VERSION).$(VENDOR_EXTENSION).src.rpm
 		-e 's,@@COMPILE_PY@@,'$(COMPILE_PY)',g' \
 		-e 's,@@CHKCONFIG_DEP@@,'$(CHKCONFIG_DEP)',g' \
 		-e 's,@@SYSTEMD_ENABLED@@,'$(SYSTEMD_ENABLED)',g' \
+		-e 's:@@INSTALL_DEP_PKG@@:'$(INSTALL_DEP_PKG)':g' \
+		-e 's:@@BUILD_DEP_PKG@@:'$(BUILD_DEP_PKG)':g' \
 		< "$(TOPDIR)/vendor/common/ocfs2-tools.spec-generic" \
 		> "$(TOPDIR)/vendor/common/ocfs2-tools.spec"
 	$(RPMBUILD) -bs --define "_sourcedir $(RPM_TOPDIR)" --define "_srcrpmdir $(RPM_TOPDIR)" "$(TOPDIR)/vendor/common/ocfs2-tools.spec"
diff --git a/vendor/common/ocfs2-tools.spec-generic.in b/vendor/common/ocfs2-tools.spec-generic.in
index 9527908..c22869b 100644
--- a/vendor/common/ocfs2-tools.spec-generic.in
+++ b/vendor/common/ocfs2-tools.spec-generic.in
@@ -35,8 +35,8 @@ Distribution: Oracle
 Vendor: Oracle
 Packager: nobody <nobody at oracle.com>
 Exclusiveos: Linux
-Requires: bash, which, coreutils, net-tools, modutils, e2fsprogs, @@CHKCONFIG_DEP@@, glib2 >= 2.2.3, util-linux >= 2.12j, redhat-lsb
-BuildRequires: e2fsprogs-devel, glib2-devel >= 2.2.3, @@PYGTK_NAME@@ >= 1.99.16, python-devel >= @@PYVERSION@@, util-linux >= 2.12j
+Requires: bash, which, coreutils, net-tools, e2fsprogs, @@CHKCONFIG_DEP@@, glib2 >= 2.2.3, util-linux >= 2.12j, redhat-lsb, @@INSTALL_DEP_PKG@@
+BuildRequires: e2fsprogs-devel, glib2-devel >= 2.2.3, @@PYGTK_NAME@@ >= 1.99.16, python-devel >= @@PYVERSION@@, util-linux >= 2.12j, @@BUILD_DEP_PKG@@
 
 BuildRoot: %{_tmppath}/ocfs2-tools-%{PACKAGE_VERSION}-%{PACKAGE_RELEASE}-root
 
diff --git a/vendor/fc7/Vendor.make b/vendor/fc7/Vendor.make
index a3002af..7342f5d 100644
--- a/vendor/fc7/Vendor.make
+++ b/vendor/fc7/Vendor.make
@@ -5,6 +5,7 @@
 TOOLSARCH = $(shell $(TOPDIR)/vendor/fc7/rpmarch.guess tools $(TOPDIR))
 VENDOR_EXTENSION = fc7
 SYSTEMD_ENABLED = 0
+INSTALL_DEP_PKG = "modutils"
 
 include $(TOPDIR)/vendor/common/Vendor.make
 
diff --git a/vendor/fc8/Vendor.make b/vendor/fc8/Vendor.make
index ba9c4f0..6ed98b6 100644
--- a/vendor/fc8/Vendor.make
+++ b/vendor/fc8/Vendor.make
@@ -5,6 +5,7 @@
 TOOLSARCH = $(shell $(TOPDIR)/vendor/fc8/rpmarch.guess tools $(TOPDIR))
 VENDOR_EXTENSION = fc8
 SYSTEMD_ENABLED = 0
+INSTALL_DEP_PKG = "modutils"
 
 include $(TOPDIR)/vendor/common/Vendor.make
 
diff --git a/vendor/fc9/Vendor.make b/vendor/fc9/Vendor.make
index 64d03fd..6767096 100644
--- a/vendor/fc9/Vendor.make
+++ b/vendor/fc9/Vendor.make
@@ -5,6 +5,7 @@
 TOOLSARCH = $(shell $(TOPDIR)/vendor/fc9/rpmarch.guess tools $(TOPDIR))
 VENDOR_EXTENSION = fc9
 SYSTEMD_ENABLED = 0
+INSTALL_DEP_PKG = "modutils"
 
 include $(TOPDIR)/vendor/common/Vendor.make
 
diff --git a/vendor/rhel4/Vendor.make b/vendor/rhel4/Vendor.make
index 5ce8e05..4f3b30e 100644
--- a/vendor/rhel4/Vendor.make
+++ b/vendor/rhel4/Vendor.make
@@ -5,6 +5,7 @@
 TOOLSARCH = $(shell $(TOPDIR)/vendor/rhel4/rpmarch.guess tools $(TOPDIR))
 VENDOR_EXTENSION = el4
 SYSTEMD_ENABLED = 0
+INSTALL_DEP_PKG = "modutils"
 
 include $(TOPDIR)/vendor/common/Vendor.make
 
diff --git a/vendor/rhel5/Vendor.make b/vendor/rhel5/Vendor.make
index 8156000..f72ddf1 100644
--- a/vendor/rhel5/Vendor.make
+++ b/vendor/rhel5/Vendor.make
@@ -5,6 +5,7 @@
 TOOLSARCH = $(shell $(TOPDIR)/vendor/rhel5/rpmarch.guess tools $(TOPDIR))
 VENDOR_EXTENSION = el5
 SYSTEMD_ENABLED = 0
+INSTALL_DEP_PKG = "modutils"
 
 include $(TOPDIR)/vendor/common/Vendor.make
 
diff --git a/vendor/rhel6/Vendor.make b/vendor/rhel6/Vendor.make
index 20144a3..e02e172 100644
--- a/vendor/rhel6/Vendor.make
+++ b/vendor/rhel6/Vendor.make
@@ -5,6 +5,7 @@
 TOOLSARCH = $(shell $(TOPDIR)/vendor/rhel6/rpmarch.guess tools $(TOPDIR))
 VENDOR_EXTENSION = el6
 SYSTEMD_ENABLED = 0
+INSTALL_DEP_PKG = "modutils"
 
 include $(TOPDIR)/vendor/common/Vendor.make
 
diff --git a/vendor/rhel7/Vendor.make b/vendor/rhel7/Vendor.make
index cc3925b..271f252 100644
--- a/vendor/rhel7/Vendor.make
+++ b/vendor/rhel7/Vendor.make
@@ -5,6 +5,8 @@
 TOOLSARCH = $(shell $(TOPDIR)/vendor/rhel7/rpmarch.guess tools $(TOPDIR))
 VENDOR_EXTENSION = el7
 SYSTEMD_ENABLED = 1
+INSTALL_DEP_PKG = "kmod"
+BUILD_DEP_PKG = "libuuid-devel\,\ ncurses-devel\,\ readline-devel"
 
 include $(TOPDIR)/vendor/common/Vendor.make
 
diff --git a/vendor/sles10/Vendor.make b/vendor/sles10/Vendor.make
index 56b1feb..17a5026 100644
--- a/vendor/sles10/Vendor.make
+++ b/vendor/sles10/Vendor.make
@@ -5,6 +5,7 @@
 TOOLSARCH = $(shell $(TOPDIR)/vendor/sles10/rpmarch.guess tools $(TOPDIR))
 VENDOR_EXTENSION = SLE10
 SYSTEMD_ENABLED = 0
+INSTALL_DEP_PKG = "modutils"
 
 include $(TOPDIR)/vendor/common/Vendor.make
 
diff --git a/vendor/sles9/Vendor.make b/vendor/sles9/Vendor.make
index 56be69f..fbdb64b 100644
--- a/vendor/sles9/Vendor.make
+++ b/vendor/sles9/Vendor.make
@@ -5,6 +5,7 @@
 TOOLSARCH = $(shell $(TOPDIR)/vendor/sles9/rpmarch.guess tools $(TOPDIR))
 VENDOR_EXTENSION = SLE9
 SYSTEMD_ENABLED = 0
+INSTALL_DEP_PKG = "modutils"
 
 include $(TOPDIR)/vendor/common/Vendor.make
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/ocfs2-tools.git

More information about the Debian-HA-Commits mailing list