cosmetic

[build.git] / Makefile

diff --git a/Makefile b/Makefile
index 5ad0380..94d2e19 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -88,6 +88,9 @@
 #
 ####################
 
+# exported to spec files as plrelease
+PLANETLAB_RELEASE = 4.2
+
 #
 # Default values
 #
@@ -232,6 +235,7 @@ $($(1).specpath):
        echo "%define distroname $(DISTRO)" >> $($(1).specpath)
        echo "%define distrorelease $(RELEASE)" >> $($(1).specpath)
        echo "%define pldistro $(PLDISTRO)" >> $($(1).specpath)
+       echo "%define plrelease $(PLANETLAB_RELEASE)" >> $($(1).specpath)
        $(if $($(1).has-date),echo "%define date $(shell date +%Y.%m.%d)" >> $($(1).specpath),)
        $(if $($(1)-SPECVARS), \
          $(foreach line,$($(1)-SPECVARS), \
@@ -564,6 +568,7 @@ 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
 myplc-release:
        @echo 'Creating myplc-release'
        rm -f $@
@@ -573,13 +578,13 @@ myplc-release:
        $(MAKE) --no-print-directory version-svns >> $@
        echo "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx rpm info" >> $@
        $(MAKE) --no-print-directory version-rpms >> $@
+       @echo $(NIGHTLY_BASE) > .base
 
 version-build:
        @echo -n 'Build bdate: ' ; date '+%Y.%m.%d'
        @echo -n 'Build btime: ' ; date '+%H:%M'
        @echo -n 'Build bhostname: ' ; hostname
        @echo    "Build base: $(NIGHTLY_BASE)"
-       @echo    "Build binit_cwd: $(INIT_CWD)"
        @echo -n 'Build btags: ' ; fgrep '$$''Id' $(PLDISTROTAGS)
        @echo    "Build tarch: $(HOSTARCH)"
        @echo    "Build tdistro: $(DISTRO)"