common Makefile.common,1.67,1.68
Dennis Gilmore (ausil)
fedora-extras-commits at redhat.com
Mon Jul 2 13:01:25 UTC 2007
Author: ausil
Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6975
Modified Files:
Makefile.common
Log Message:
apply sethc patch to not append core to make mockbuild and uncomment out the list of secondary archs and add the niagara ones
Index: Makefile.common
===================================================================
RCS file: /cvs/extras/common/Makefile.common,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- Makefile.common 15 Jun 2007 17:10:50 -0000 1.67
+++ Makefile.common 2 Jul 2007 13:00:55 -0000 1.68
@@ -45,8 +45,19 @@
DISTVAR := rhel
MOCKCFG ?= fedora-$(DISTVAL)-$(BUILDARCH)-epel.cfg
else
-MOCKCFG ?= fedora-$(DISTVAL)-$(BUILDARCH)-core.cfg
+MOCKCFG ?= fedora-$(DISTVAL)-$(BUILDARCH).cfg
endif
+## 4, 5, 6 need -core
+ifeq ($(DISTVAL),4)
+MOCKCFG = fedora-$(DISTVAL)-$(BUILDARCH)-core.cfg
+endif
+ifeq ($(DISTVAL),5)
+MOCKCFG = fedora-$(DISTVAL)-$(BUILDARCH)-core.cfg
+endif
+ifeq ($(DISTVAL),6)
+MOCKCFG = fedora-$(DISTVAL)-$(BUILDARCH)-core.cfg
+endif
+
## SOURCEDIR is special; it has to match the CVS checkout directory,
## because the CVS checkout directory contains the patch files. So it basically
## can't be overridden without breaking things. But we leave it a variable
@@ -133,7 +144,7 @@
endef
# list the possible targets for valid arches
-ARCHES = noarch i386 i586 i686 x86_64 ia64 s390 s390x ppc ppc64 pseries ppc64pseries iseries ppc64iseries # athlon alpha alphaev6 sparc sparc64 sparcv9 i164 mac sh mips
+ARCHES = noarch i386 i586 i686 x86_64 ia64 s390 s390x ppc ppc64 pseries ppc64pseries iseries ppc64iseries athlon alpha alphaev6 sparc sparc64 sparcv9 sparcv9v sparc64v i164 mac sh mips
# for the modules that do different "make prep" depending on what arch we build for
PREP_ARCHES = $(addprefix prep-,$(ARCHES))
More information about the scm-commits
mailing list