[Ocfs2-commits] jlbec commits r2769 - in branches/ocfs2-1.2: . vendor

[svn-commits@oss.oracle.com]

Author: jlbec
Signed-off-by: mfasheh
Date: 2006-02-22 16:53:08 -0600 (Wed, 22 Feb 2006)
New Revision: 2769

Added:
   branches/ocfs2-1.2/vendor/ax2/
   branches/ocfs2-1.2/vendor/rhel4/
   branches/ocfs2-1.2/vendor/sles9/
Removed:
   branches/ocfs2-1.2/vendor/asianux/
   branches/ocfs2-1.2/vendor/redhat/
   branches/ocfs2-1.2/vendor/suse/
Modified:
   branches/ocfs2-1.2/Makefile
   branches/ocfs2-1.2/configure.in
   branches/ocfs2-1.2/vendor/Makefile
Log:

o Rename the vendor branches in preparation for the vendor guess code.

Signed-off-by: mfasheh



Modified: branches/ocfs2-1.2/Makefile
===================================================================
--- branches/ocfs2-1.2/Makefile	2006-02-21 23:22:23 UTC (rev 2768)
+++ branches/ocfs2-1.2/Makefile	2006-02-22 22:53:08 UTC (rev 2769)
@@ -51,14 +51,14 @@
 #
 # AX2
 #
-$(TOPDIR)/vendor/asianux/ocfs2-2.6.9-%AX.spec: $(TOPDIR)/vendor/asianux/ocfs2-2.6.9-AX.spec-generic
+$(TOPDIR)/vendor/ax2/ocfs2-2.6.9-%AX.spec: $(TOPDIR)/vendor/ax2/ocfs2-2.6.9-AX.spec-generic
 	SPECVER="$@"; \
 		SPECVER="$${SPECVER#*ocfs2-2.6.9-}"; \
 		SPECVER="$${SPECVER%AX.spec}"; \
 		sed -e 's/^%define sver.*%{generic}$$/%define sver		'$${SPECVER}'/' < $< > $@
 
-ax2_%_srpm: dist $(TOPDIR)/vendor/asianux/ocfs2-2.6.9-%AX.spec
-	rpmbuild -bs --define "_sourcedir $(TOPDIR)" --define "_srcrpmdir $(TOPDIR)" $(TOPDIR)/vendor/asianux/ocfs2-2.6.9-$(patsubst ax2_%_srpm,%,$@)AX.spec
+ax2_%_srpm: dist $(TOPDIR)/vendor/ax2/ocfs2-2.6.9-%AX.spec
+	rpmbuild -bs --define "_sourcedir $(TOPDIR)" --define "_srcrpmdir $(TOPDIR)" $(TOPDIR)/vendor/ax2/ocfs2-2.6.9-$(patsubst ax2_%_srpm,%,$@)AX.spec
 
 ax2_%_rpm: ax2_%_srpm
 	rpmbuild --rebuild $(MODULEARCH) ocfs2-2.6.9-$(patsubst ax2_%_rpm,%,$@)AX-$(DIST_VERSION)-$(RPM_VERSION).src.rpm
@@ -67,14 +67,14 @@
 #
 # RHEL4
 #
-$(TOPDIR)/vendor/redhat/ocfs2-2.6.9-%.EL.spec: $(TOPDIR)/vendor/redhat/ocfs2-2.6.9-EL.spec-generic
+$(TOPDIR)/vendor/rhel4/ocfs2-2.6.9-%.EL.spec: $(TOPDIR)/vendor/rhel4/ocfs2-2.6.9-EL.spec-generic
 	SPECVER="$@"; \
 		SPECVER="$${SPECVER#*ocfs2-2.6.9-}"; \
 		SPECVER="$${SPECVER%.EL.spec}"; \
 		sed -e 's/^%define sver.*%{generic}$$/%define sver		'$${SPECVER}'/' < $< > $@
 
-rhel4_%_srpm: dist $(TOPDIR)/vendor/redhat/ocfs2-2.6.9-%.EL.spec
-	rpmbuild -bs --define "_sourcedir $(TOPDIR)" --define "_srcrpmdir $(TOPDIR)" $(TOPDIR)/vendor/redhat/ocfs2-2.6.9-$(patsubst rhel4_%_srpm,%,$@).EL.spec
+rhel4_%_srpm: dist $(TOPDIR)/vendor/rhel4/ocfs2-2.6.9-%.EL.spec
+	rpmbuild -bs --define "_sourcedir $(TOPDIR)" --define "_srcrpmdir $(TOPDIR)" $(TOPDIR)/vendor/rhel4/ocfs2-2.6.9-$(patsubst rhel4_%_srpm,%,$@).EL.spec
 
 rhel4_%_rpm: rhel4_%_srpm
 	rpmbuild --rebuild $(MODULEARCH) ocfs2-2.6.9-$(patsubst rhel4_%_rpm,%,$@).EL-$(DIST_VERSION)-$(RPM_VERSION).src.rpm
@@ -83,14 +83,14 @@
 #
 # SLES9
 #
-$(TOPDIR)/vendor/suse/ocfs2-2.6.5-%.spec: $(TOPDIR)/vendor/suse/ocfs2-2.6.5.spec-generic
+$(TOPDIR)/vendor/sles9/ocfs2-2.6.5-%.spec: $(TOPDIR)/vendor/sles9/ocfs2-2.6.5.spec-generic
 	SPECVER="$@"; \
 		SPECVER="$${SPECVER#*ocfs2-2.6.5-}"; \
 		SPECVER="$${SPECVER%.spec}"; \
 		sed -e 's/^%define sver.*%{generic}$$/%define sver		'$${SPECVER}'/' < $< > $@
 
-sles9_%_srpm: dist $(TOPDIR)/vendor/suse/ocfs2-2.6.5-%.spec
-	rpmbuild -bs --define "_sourcedir `pwd`" --define "_srcrpmdir `pwd`" $(TOPDIR)/vendor/suse/ocfs2-2.6.5-$(patsubst sles9_%_srpm,%,$@).spec
+sles9_%_srpm: dist $(TOPDIR)/vendor/sles9/ocfs2-2.6.5-%.spec
+	rpmbuild -bs --define "_sourcedir `pwd`" --define "_srcrpmdir `pwd`" $(TOPDIR)/vendor/sles9/ocfs2-2.6.5-$(patsubst sles9_%_srpm,%,$@).spec
 
 sles9_%_rpm: sles9_%_srpm
 	rpmbuild --rebuild $(MODULEARCH) "ocfs2-2.6.5-$(patsubst sles9_%_rpm,%,$@)-$(DIST_VERSION)-$(RPM_VERSION).src.rpm"

Modified: branches/ocfs2-1.2/configure.in
===================================================================
--- branches/ocfs2-1.2/configure.in	2006-02-21 23:22:23 UTC (rev 2768)
+++ branches/ocfs2-1.2/configure.in	2006-02-22 22:53:08 UTC (rev 2769)
@@ -293,7 +293,7 @@
 AC_SUBST(KAPI_COMPAT_CFLAGS)
 
 AC_OUTPUT([Config.make
-vendor/asianux/ocfs2-2.6.9-AX.spec-generic
-vendor/redhat/ocfs2-2.6.9-EL.spec-generic
-vendor/suse/ocfs2-2.6.5.spec-generic
+vendor/ax2/ocfs2-2.6.9-AX.spec-generic
+vendor/rhel4/ocfs2-2.6.9-EL.spec-generic
+vendor/sles9/ocfs2-2.6.5.spec-generic
 ])

Modified: branches/ocfs2-1.2/vendor/Makefile
===================================================================
--- branches/ocfs2-1.2/vendor/Makefile	2006-02-21 23:22:23 UTC (rev 2768)
+++ branches/ocfs2-1.2/vendor/Makefile	2006-02-22 22:53:08 UTC (rev 2769)
@@ -2,6 +2,6 @@
 
 include $(TOPDIR)/Preamble.make
 
-SUBDIRS = asianux redhat suse
+SUBDIRS = ax2 rhel4 sles9
 
 include $(TOPDIR)/Postamble.make

Copied: branches/ocfs2-1.2/vendor/ax2 (from rev 2768, branches/ocfs2-1.2/vendor/asianux)

Copied: branches/ocfs2-1.2/vendor/rhel4 (from rev 2768, branches/ocfs2-1.2/vendor/redhat)

Copied: branches/ocfs2-1.2/vendor/sles9 (from rev 2768, branches/ocfs2-1.2/vendor/suse)