X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=494ef95f6af3ac11339a75d0f71ebf494cc5550f;hb=2019f47782cb2c27023b311721c9d9e65cb823b8;hp=2775fb6916d36836a520d79ace634e17257b55b3;hpb=1d38865771d05dfeb9c3a40710f74456dcbbea11;p=build.git

diff --git a/Makefile b/Makefile
index 2775fb69..494ef95f 100644
--- a/Makefile
+++ b/Makefile
@@ -56,6 +56,8 @@
 #     a set of *packages* that this package depends on
 # (*) package-DEPEND-DEVEL-RPMS
 #     a set of *rpms* that the build will rpm-install before building <package>
+#     this is intended to denote local rpms, i.e. ones that are results of our own build
+#     stock rpms should be mentioned in config.planetlab/devel.pkgs
 # (*) package-DEPEND-FILES
 #     a set of files that the package depends on - and that make needs to know about
 #     if this contains RPMS/yumgroups.xml, then the toplevel RPMS's index 
@@ -92,7 +94,7 @@
 ####################
 
 # exported to spec files as plrelease
-PLANETLAB_RELEASE = 4.2
+PLANETLAB_RELEASE = 5.0
 
 #
 # Default values
@@ -308,8 +310,7 @@ spec2make: spec2make.c
 define target_mk
 MAKE/$(1).mk: $($(1).specpath) spec2make .rpmmacros
 	mkdir -p MAKE
-	./spec2make $($(1)-RPMFLAGS) $($(1).specpath) $(1) > MAKE/$(1).mk
-	@if [ -z MAKE/$(1).mk ] ; then rm MAKE/$(1).mk ; exit 1 ; fi
+	./spec2make $($(1)-RPMFLAGS) $($(1).specpath) $(1) > MAKE/$(1).mk || { rm MAKE/$(1).mk; exit 1; }
 endef
 
 $(foreach package,$(ALL),$(eval $(call target_mk,$(package))))
@@ -319,6 +320,10 @@ $(foreach package,$(ALL),$(eval $(call target_mk,$(package))))
 pldistro.mk:
 	echo "PLDISTRO:=$(PLDISTRO)" > $@
 	echo "PLDISTROTAGS:=$(PLDISTROTAGS)" >> $@
+	echo "build-SVNPATH:=$(build-SVNPATH)" >> $@
+	echo "PERSONALITY:=$(PERSONALITY)" >> $@
+	echo "MAILTO:=$(MAILTO)" >> $@
+	echo "BASE:=$(BASE)" >> $@
 
 savepldistro: pldistro.mk
 .PHONY: savepldistro
@@ -593,8 +598,8 @@ develclean:
 ####################
 # gather build information for the 'About' page
 # when run from crontab, INIT_CWD not properly set (says /root ..)
-# so, the nightly build passes NIGHTLY_BASE here
-# also store the nightly_base in .base for any post-processing purposes
+# so, the nightly build passes BASE here
+# also store BASE in .base for any post-processing purposes
 myplc-release:
 	@echo 'Creating myplc-release'
 	rm -f $@
@@ -604,13 +609,13 @@ myplc-release:
 	$(MAKE) --no-print-directory version-svns >> $@
 	echo "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx rpm info" >> $@
 	$(MAKE) --no-print-directory version-rpms >> $@
-	@echo $(NIGHTLY_BASE) > .base
+	@echo $(BASE) > .base
 
 version-build:
 	@echo -n 'Build build-date: ' ; date '+%Y.%m.%d'
 	@echo -n 'Build build-time: ' ; date '+%H:%M-%Z'
 	@echo -n 'Build build-hostname: ' ; hostname
-	@echo    "Build build-base: $(NIGHTLY_BASE)"
+	@echo    "Build build-base: $(BASE)"
 	@echo    "Build planetlab-distro: $(PLDISTRO)"
 	@echo    "Build planetlab-tags: $(PLDISTROTAGS)"
 	@echo -n 'Build planetlab-tagsid: ' ; fgrep '$$''Id' $(PLDISTROTAGS)
@@ -618,7 +623,7 @@ version-build:
 	@echo    "Build target-distro: $(DISTRO)"
 	@echo    "Build target-distroname: $(DISTRONAME)"
 	@echo    "Build target-release: $(RELEASE)"	
-	@echo    "Build target-personality: $(NIGHTLY_PERSONALITY)"	
+	@echo    "Build target-personality: $(PERSONALITY)"	
 
 #################### 
 # for a given module