[Oracleasm-commits] jlbec commits r316 - in trunk: . vendor/common vendor/rhel4 vendor/sles9

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2005-11-20 04:09:07 -0600 (Sun, 20 Nov 2005)
New Revision: 316

Added:
   trunk/Vendor.make
   trunk/vendor/common/Vendor.make
   trunk/vendor/rhel4/Vendor.make
   trunk/vendor/sles9/Vendor.make
Modified:
   trunk/Makefile
Log:

o Add Vendor.make and its infrastructure
o Move vendor-specific stuff to vendor directories



Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2005-11-20 09:52:51 UTC (rev 315)
+++ trunk/Makefile	2005-11-20 10:09:07 UTC (rev 316)
@@ -35,54 +35,10 @@
 	rpmarch.guess
 
 
-#
-# Support files
-#
 
-$(TOPDIR)/oracleasm-support-$(DIST_VERSION)-$(RPM_VERSION).src.rpm: $(TOPDIR)/vendor/common/oracleasm-support.spec
-	$(RPMBUILD) -bs --define "_sourcedir $(RPM_TOPDIR)" --define "_srcrpmdir $(RPM_TOPDIR)" "$(TOPDIR)/vendor/common/oracleasm-support.spec"
+include Vendor.make
 
-support_srpm: $(TOPDIR)/oracleasm-support-$(DIST_VERSION)-$(RPM_VERSION).src.rpm
-
-support_rpm: support_srpm
-	$(RPMBUILD) --rebuild $(TOOLSARCH) "oracleasm-support-$(DIST_VERSION)-$(RPM_VERSION).src.rpm"
-
-
 #
-# SLES 9
-#
-
-$(TOPDIR)/vendor/sles9/oracleasm-2.6.5-%.spec: $(TOPDIR)/vendor/sles9/oracleasm-2.6.5.spec-generic
-	SPECVER="$@"; \
-		SPECVER="$${SPECVER#*oracleasm-2.6.5-}"; \
-		SPECVER="$${SPECVER%.spec}"; \
-		sed -e 's/^%define sver.*%{generic}$$/%define sver		'$${SPECVER}'/' < $< > $@
-
-sles9_%_srpm: dist $(TOPDIR)/vendor/sles9/oracleasm-2.6.5-%.spec
-	$(RPMBUILD) -bs --define "_sourcedir $(RPM_TOPDIR)" --define "_srcrpmdir $(RPM_TOPDIR)" $(TOPDIR)/vendor/sles9/oracleasm-2.6.5-$(patsubst sles9_%_srpm,%,$@).spec
-
-sles9_%_rpm: sles9_%_srpm
-	$(RPMBUILD) --rebuild $(MODULEARCH) "oracleasm-2.6.5-$(patsubst sles9_%_rpm,%,$@)-$(DIST_VERSION)-$(RPM_VERSION).src.rpm"
-
-
-#
-# RHEL 4
-#
-
-$(TOPDIR)/vendor/rhel4/oracleasm-2.6.9-%.spec: $(TOPDIR)/vendor/rhel4/oracleasm-2.6.9-EL.spec-generic
-	SPECVER="$@"; \
-		SPECVER="$${SPECVER#*oracleasm-2.6.9-}"; \
-		SPECVER="$${SPECVER%.EL.spec}"; \
-		sed -e 's/^%define sver.*%{generic}$$/%define sver		'$${SPECVER}'/' < $< > $@
-
-rhel4_%_srpm: dist $(TOPDIR)/vendor/rhel4/oracleasm-2.6.9-%.EL.spec
-	$(RPMBUILD) -bs --define "_sourcedir $(RPM_TOPDIR)" --define "_srcrpmdir $(RPM_TOPDIR)" $(TOPDIR)/vendor/rhel4/oracleasm-2.6.9-$(patsubst rhel4_%_srpm,%,$@).EL.spec
-
-rhel4_%_rpm: rhel4_%_srpm
-	$(RPMBUILD) --rebuild $(MODULEARCH) "oracleasm-2.6.9-$(patsubst rhel4_%_rpm,%,$@).EL-$(DIST_VERSION)-$(RPM_VERSION).src.rpm"
-
-
-#
 # Include this at the very end of the Makefile
 #
 include $(TOPDIR)/Postamble.make

Added: trunk/Vendor.make
===================================================================
--- trunk/Vendor.make	2005-11-20 09:52:51 UTC (rev 315)
+++ trunk/Vendor.make	2005-11-20 10:09:07 UTC (rev 316)
@@ -0,0 +1,8 @@
+
+#
+# This Makefile snippet is to be included in Makebo Makefiles that
+# use the mbvendor infrastructure
+#
+
+-include $(TOPDIR)/vendor/$(shell ./vendor.guess)/Vendor.make
+

Added: trunk/vendor/common/Vendor.make
===================================================================
--- trunk/vendor/common/Vendor.make	2005-11-20 09:52:51 UTC (rev 315)
+++ trunk/vendor/common/Vendor.make	2005-11-20 10:09:07 UTC (rev 316)
@@ -0,0 +1,12 @@
+#
+# Support files
+#
+
+$(TOPDIR)/oracleasm-support-$(DIST_VERSION)-$(RPM_VERSION).src.rpm: $(TOPDIR)/vendor/common/oracleasm-support.spec
+	$(RPMBUILD) -bs --define "_sourcedir $(RPM_TOPDIR)" --define "_srcrpmdir $(RPM_TOPDIR)" "$(TOPDIR)/vendor/common/oracleasm-support.spec"
+
+support_srpm: $(TOPDIR)/oracleasm-support-$(DIST_VERSION)-$(RPM_VERSION).src.rpm
+
+support_rpm: support_srpm
+	$(RPMBUILD) --rebuild $(TOOLSARCH) "oracleasm-support-$(DIST_VERSION)-$(RPM_VERSION).src.rpm"
+

Added: trunk/vendor/rhel4/Vendor.make
===================================================================
--- trunk/vendor/rhel4/Vendor.make	2005-11-20 09:52:51 UTC (rev 315)
+++ trunk/vendor/rhel4/Vendor.make	2005-11-20 10:09:07 UTC (rev 316)
@@ -0,0 +1,18 @@
+#
+# RHEL 4
+#
+
+$(TOPDIR)/vendor/rhel4/oracleasm-2.6.9-%.spec: $(TOPDIR)/vendor/rhel4/oracleasm-2.6.9-EL.spec-generic
+	SPECVER="$@"; \
+		SPECVER="$${SPECVER#*oracleasm-2.6.9-}"; \
+		SPECVER="$${SPECVER%.EL.spec}"; \
+		sed -e 's/^%define sver.*%{generic}$$/%define sver		'$${SPECVER}'/' < $< > $@
+
+rhel4_%_srpm: dist $(TOPDIR)/vendor/rhel4/oracleasm-2.6.9-%.EL.spec
+	$(RPMBUILD) -bs --define "_sourcedir $(RPM_TOPDIR)" --define "_srcrpmdir $(RPM_TOPDIR)" $(TOPDIR)/vendor/rhel4/oracleasm-2.6.9-$(patsubst rhel4_%_srpm,%,$@).EL.spec
+
+rhel4_%_rpm: rhel4_%_srpm
+	$(RPMBUILD) --rebuild $(MODULEARCH) "oracleasm-2.6.9-$(patsubst rhel4_%_rpm,%,$@).EL-$(DIST_VERSION)-$(RPM_VERSION).src.rpm"
+
+
+include $(TOPDIR)/vendor/common/Vendor.make

Added: trunk/vendor/sles9/Vendor.make
===================================================================
--- trunk/vendor/sles9/Vendor.make	2005-11-20 09:52:51 UTC (rev 315)
+++ trunk/vendor/sles9/Vendor.make	2005-11-20 10:09:07 UTC (rev 316)
@@ -0,0 +1,18 @@
+#
+# SLES 9
+#
+
+$(TOPDIR)/vendor/sles9/oracleasm-2.6.5-%.spec: $(TOPDIR)/vendor/sles9/oracleasm-2.6.5.spec-generic
+	SPECVER="$@"; \
+		SPECVER="$${SPECVER#*oracleasm-2.6.5-}"; \
+		SPECVER="$${SPECVER%.spec}"; \
+		sed -e 's/^%define sver.*%{generic}$$/%define sver		'$${SPECVER}'/' < $< > $@
+
+sles9_%_srpm: dist $(TOPDIR)/vendor/sles9/oracleasm-2.6.5-%.spec
+	$(RPMBUILD) -bs --define "_sourcedir $(RPM_TOPDIR)" --define "_srcrpmdir $(RPM_TOPDIR)" $(TOPDIR)/vendor/sles9/oracleasm-2.6.5-$(patsubst sles9_%_srpm,%,$@).spec
+
+sles9_%_rpm: sles9_%_srpm
+	$(RPMBUILD) --rebuild $(MODULEARCH) "oracleasm-2.6.5-$(patsubst sles9_%_rpm,%,$@)-$(DIST_VERSION)-$(RPM_VERSION).src.rpm"
+
+
+include $(TOPDIR)/vendor/common/Vendor.make