X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=a5131e564e7da7963fcb4645f591d284457cc98c;hb=058993e1c15609914e91fe4d13b48791f41e6ea1;hp=d53a09034561325a6a1c0118a82036a38413186a;hpb=bd92a6a08f263e3da8ad2c24a9ed65e06a1418b5;p=build.git

diff --git a/Makefile b/Makefile
index d53a0903..a5131e56 100644
--- 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
 #
@@ -89,13 +81,16 @@
 #
 # the build defines some make variables that are extracted from spec files
 # see for example
-# (*)  $ make ulogd.pkginfo
+# (*)  $ make ulogd-pkginfo
 #        to see the list f variables attached to a given package
-# (*)  $ make kernel-devel.rpminfo
+# (*)  $ make kernel-devel-rpminfo
 #        to see the list f variables attached to a given rpm
 #
 ####################
 
+# exported to spec files as plrelease
+PLANETLAB_RELEASE = 4.2
+
 #
 # Default values
 #
@@ -188,15 +183,10 @@ all: repo
 endif
 endif
 
-### yumgroups.xml
-# the source
-ifndef YUMGROUPS
-YUMGROUPS := groups/$(PLDISTRO).xml
-endif
-
-RPMS/yumgroups.xml: $(YUMGROUPS)
+### yumgroups.xml : compute from all known .pkgs files
+RPMS/yumgroups.xml: 
 	mkdir -p RPMS
-	install -D -m 644 $(YUMGROUPS) $@
+	./yumgroups.sh $(PLDISTRO) > $@
 
 createrepo = createrepo --quiet -g yumgroups.xml RPMS/ 
 
@@ -229,9 +219,9 @@ $(foreach package, $(ALL), $(eval $(call stage1_variables,$(package))))
 # 
 define package_hasdate
 $(1).has-date = $(if $(subst myplc,,$(1)), \
-	          $(if $($(1)-SVNPATH),\
-		     $(if $(findstring /trunk,$($(1)-SVNPATH)),yes,),\
-		     $(if $(findstring HEAD,$($(1)-TAG)),yes,)), \
+	          $(if $($($(1).module)-SVNPATH),\
+		     $(if $(findstring /trunk,$($($(1).module)-SVNPATH)),yes,),\
+		     $(if $(findstring HEAD,$($($(1).module)-TAG)),yes,)), \
 		yes)
 endef
 
@@ -245,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), \
@@ -435,41 +426,51 @@ rpms: $(ALLRPMS)
 # use tmp dirs when building binary rpm so make remains idempotent 
 # otherwise SOURCES/ or SPEC gets touched again - which leads to rebuilding
 RPM-USE-TMP-DIRS = --define "_sourcedir $(HOME)/tmp" --define "_specdir $(HOME)/tmp"
+RPM-USE-COMPILE-DIRS = --define "_sourcedir $(HOME)/COMPILE" --define "_specdir $(HOME)/COMPILE"
 
 # usage: build_binary_rpm package
 # xxx hacky - invoke createrepo if DEPEND-FILES mentions RPMS/yumgroups.xml
 define target_binary_rpm 
 $($(1).rpms): $($(1).srpm)
-	mkdir -p BUILD RPMS tmp
+	mkdir -p RPMS tmp
 	@(echo -n "XXXXXXXXXXXXXXX -- BEG RPM $(1) " ; date)
 	$(if $(findstring RPMS/yumgroups.xml,$($(1)-DEPEND-FILES)), $(createrepo) , )
 	$(if $($(1).all-devel-rpm-paths), $(RPM-INSTALL-DEVEL) $($(1).all-devel-rpm-paths))
 	$($(1).rpmbuild) --rebuild $(RPM-USE-TMP-DIRS) $($(1).srpm)
 	$(if $($(1)-DEPEND-DEVEL-RPMS), $(RPM-UNINSTALL-DEVEL) $($(1)-DEPEND-DEVEL-RPMS))
 	@(echo -n "XXXXXXXXXXXXXXX -- END RPM $(1) " ; date)
+# for manual use only - in case we need to investigate the results of an rpmbuild
+$(1)-compile: $($(1).srpm)
+	mkdir -p COMPILE tmp
+	@(echo -n "XXXXXXXXXXXXXXX -- BEG compile $(1) " ; date)
+	$(if $(findstring RPMS/yumgroups.xml,$($(1)-DEPEND-FILES)), $(createrepo) , )
+	$(if $($(1).all-devel-rpm-paths), $(RPM-INSTALL-DEVEL) $($(1).all-devel-rpm-paths))
+	$($(1).rpmbuild) --recompile $(RPM-USE-TMP-DIRS) $($(1).srpm)
+	$(if $($(1)-DEPEND-DEVEL-RPMS), $(RPM-UNINSTALL-DEVEL) $($(1)-DEPEND-DEVEL-RPMS))
+	@(echo -n "XXXXXXXXXXXXXXX -- END compile $(1) " ; date)
+.PHONY: $(1)-compile
 endef
 
 $(foreach package,$(ALL),$(eval $(call target_binary_rpm,$(package))))
-
 ### shorthand target
 # e.g. make proper -> does propers rpms
 # usage shorthand_target package
 define target_shorthand 
-$(1): $($(package).rpms)
+$(1): $($(1).rpms)
 .PHONY: $(1)
-$(1)-spec: $($(package)-SPEC)
+$(1)-spec: $($(1)-SPEC)
 .PHONY: $(1)-spec
-$(1)-mk: $($(package)-MK)
+$(1)-mk: $($(1)-MK)
 .PHONY: $(1)-mk
-$(1)-tarball: $($(package).tarballs)
+$(1)-tarball: $($(1).tarballs)
 .PHONY: $(1)-tarball
-$(1)-codebase: $($(package).codebase)
+$(1)-codebase: $($(1).codebase)
 .PHONY: $(1)-source
-$(1)-source: $($(package).source)
+$(1)-source: $($(1).source)
 .PHONY: $(1)-codebase
-$(1)-rpms: $($(package).rpms)
+$(1)-rpms: $($(1).rpms)
 .PHONY: $(1)-rpms
-$(1)-srpm: $($(package).srpm)
+$(1)-srpm: $($(1).srpm)
 .PHONY: $(1)-srpm
 endef
 
@@ -565,7 +566,9 @@ 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
+# also store the nightly_base in .base for any post-processing purposes
 myplc-release:
 	@echo 'Creating myplc-release'
 	rm -f $@
@@ -575,17 +578,20 @@ 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 blocation: $(INIT_CWD)"
-	@echo    "Build blocation2: $${INIT_CWD}"
-	@echo -n 'Build tags file: ' ; fgrep '$$''Id' $(PLDISTROTAGS)
-	@echo    "Build tarch: $(HOSTARCH)"
-	@echo    "Build tdistro: $(DISTRO)"
-	@echo    "Build trelease: $(RELEASE)"	
+	@echo -n 'Build build-date: ' ; date '+%Y.%m.%d'
+	@echo -n 'Build build-time: ' ; date '+%H:%M'
+	@echo -n 'Build build-hostname: ' ; hostname
+	@echo    "Build build-base: $(NIGHTLY_BASE)"
+	@echo    "Build planetab-distro: $(PLDISTRO)"
+	@echo    "Build planetlab-tags: $(PLDISTROTAGS)"
+	@echo -n 'Build planetlab-tagsid: ' ; fgrep '$$''Id' $(PLDISTROTAGS)
+	@echo    "Build target-arch: $(HOSTARCH)"
+	@echo    "Build target-distro: $(DISTRO)"
+	@echo    "Build target-release: $(RELEASE)"	
+	@echo    "Build target-personality: $(NIGHTLY_PERSONALITY)"	
 
 #################### 
 # for a given module
@@ -615,7 +621,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
@@ -661,6 +667,11 @@ help:
 	@echo 'make srpms'
 	@echo 'make rpms'
 	@echo ""
+	@echo "********** Manual targets"
+	@echo "make package-compile"
+	@echo "  The regular process uses rpmbuild --rebuild, that performs"
+	@echo "  a compilation directory cleanup upon completion. If you need to investigate"
+	@echo "  the intermediate compilation directory, use the -compile targets"
 	@echo "********** Cleaning examples"
 	@echo "make clean"
 	@echo "  removes the files made by make"
@@ -683,9 +694,9 @@ help:
 	@echo "make ++ALL"
 	@echo "  Displays the value of a given variable (here ALL)"
 	@echo "  with only a single plus sign only the value is displayed"
-	@echo "make ulogd.pkginfo"
+	@echo "make ulogd-pkginfo"
 	@echo "  Displays know attributes of a package"
-	@echo "make kernel-devel.rpminfo"
+	@echo "make kernel-devel-rpminfo"
 	@echo "  Displays know attributes of an rpm"
 	@echo ""
 	@echo "********** Known pakages are"
@@ -702,11 +713,11 @@ help:
 	@echo "$($(varname))"
 ## package info
 PKGKEYS := tarballs source codebase srpm rpms rpmnames rpm-release rpm-name rpm-version rpm-subversion
-%.pkginfo: package=$(subst .pkginfo,,$@)
-%.pkginfo: 
+%-pkginfo: package=$(subst -pkginfo,,$@)
+%-pkginfo: 
 	@$(foreach key,$(PKGKEYS),echo "$(package).$(key)=$($(package).$(key))";)
 ## rpm info
 RPMKEYS := rpm-path package
-%.rpminfo: rpm=$(subst .rpminfo,,$@)
-%.rpminfo: 
+%-rpminfo: rpm=$(subst -rpminfo,,$@)
+%-rpminfo: 
 	@$(foreach key,$(RPMKEYS),echo "$(rpm).$(key)=$($(rpm).$(key))";)