yumgroups generated from bootstrapfs.pkgs

[build.git] / Makefile

diff --git a/Makefile b/Makefile
index d53a090..58d0fc6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,15 +21,7 @@
 #     
 #################### (planetlab) distributions
 #
-# (*) the default distribution is called 'planetlab'
-# (*) you may define an alternative distribution, e.g. onelab
-# in this case you need to
-# (*) create onelab.mk that defines your *packages* (see below)
-# (*) create onelab-tags.mk that defines where to fetch your *modules*
-# (*) create your main yumgroups.xml as groups/<distro>.xml
-# (*) there are also various places where a set of modules are defined.
-#     check for .lst files in the various modules that build root images
-#     and mimic what's done for planetlab 
+# (*) see README-pldistros.txt
 # (*) then you need to run 
 #     make stage1=true PLDISTRO=onelab
 #
@@ -188,15 +180,10 @@ all: repo
 endif
 endif
 
-### yumgroups.xml
-# the source
-ifndef YUMGROUPS
-YUMGROUPS := groups/$(PLDISTRO).xml
-endif
-
-RPMS/yumgroups.xml: $(YUMGROUPS)
+### yumgroups.xml : compute from bootstrapfs.pkgs
+RPMS/yumgroups.xml: 
        mkdir -p RPMS
-       install -D -m 644 $(YUMGROUPS) $@
+       yumgroups.sh $(PLDISTRO) bootstrapfs.pkgs > $@
 
 createrepo = createrepo --quiet -g yumgroups.xml RPMS/ 
 
@@ -565,7 +552,8 @@ develclean:
 
 ####################
 # gather build information for the 'About' page
-# uses INIT_CWD to try and guess the vserver location
+# when run from crontab, INIT_CWD not properly set (says /root ..)
+# so, the nightly build passes NIGHTLY_BASE here
 myplc-release:
        @echo 'Creating myplc-release'
        rm -f $@
@@ -580,9 +568,9 @@ version-build:
        @echo -n 'Build bdate: ' ; date '+%Y.%m.%d'
        @echo -n 'Build btime: ' ; date '+%H:%M'
        @echo -n 'Build bhostname: ' ; hostname
-       @echo    "Build blocation: $(INIT_CWD)"
-       @echo    "Build blocation2: $${INIT_CWD}"
-       @echo -n 'Build tags file: ' ; fgrep '$$''Id' $(PLDISTROTAGS)
+       @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)"
        @echo    "Build trelease: $(RELEASE)"   
@@ -615,7 +603,7 @@ endef
 
 $(foreach package,$(sort $(ALL)), $(eval $(call rpm_version_target,$(package))))
 
-versions: version-build version-svns version-rpms
+versions: myplc-release version-build version-svns version-rpms
 .PHONY: versions version-build version-rpms version-svns
 
 #################### include install Makefile