X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=b6a805109973f903c23715cfdd039bff63dcf91b;hb=9ea5b989755ac93dd67b5ad7628b17cf7adc2484;hp=0e17d51c3999e0c6b0e87b5880a864db183aef71;hpb=55c630bcdd6858496d2aa0e97985d988fbd1591e;p=build.git

diff --git a/Makefile b/Makefile
index 0e17d51c..b6a80510 100644
--- a/Makefile
+++ b/Makefile
@@ -64,6 +64,9 @@
 # (*) package-RPMBUILD: If not rpmbuild - mostly used for sudo'ing rpmbuild
 # (*) package-BUILD-FROM-SRPM: set this to any non-empty value, if your package is able to produce 
 #     a source rpms by running 'make srpm'
+# (*) package-RPMDATE: set this to any non-empty value to get the rpm package's release field hold the current date
+#     this is useful for container packages, like e.g. bootstrapfs or vserver, that contains much more than the
+#     correspondng module
 #
 #################### modules
 # Required information about the various modules (set this in e.g. planetlab-tags.mk)
@@ -81,19 +84,24 @@
 #
 # 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
-#        to see the list f variables attached to a given rpm
+# (*)  $ make kernel-devel-rpminfo
+#        to see the list of variables attached to a given rpm
 #
 ####################
 
+# exported to spec files as plrelease
+PLANETLAB_RELEASE = 4.2
+
 #
 # Default values
 #
-HOSTARCH := $(shell uname -i)
+# minimal compat with macos, just so this does not complain 
+HOSTARCH := $(shell uname -i 2> /dev/null || uname -m 2> /dev/null)
 DISTRO := $(shell ./getdistro.sh)
 RELEASE := $(shell ./getrelease.sh)
+DISTRONAME := $(shell ./getdistroname.sh)
 RPM-INSTALL-DEVEL := rpm --force -Uvh
 # cannot force rpm -e
 RPM-UNINSTALL-DEVEL := rpm -e
@@ -204,39 +212,47 @@ define stage1_variables
 $(1).spec = $(notdir $($(1)-SPEC))
 $(1).specpath = SPECS/$(1).spec
 $(1).module = $(firstword $($(1)-MODULES))
+$(1)-SVNPATH = $(strip $($(1)-SVNPATH))
 endef
 
 $(foreach package, $(ALL), $(eval $(call stage1_variables,$(package))))
 
 #
-# for each package, compute whether we need to set date (i.e. whether we use the trunk)
-# the myplc package is forced to have a date, because it is more convenient
-# (we cannot bump its number everytime something changes in the system)
-# myplc-native does not need this trick
+# for each package, compute whether we need to set date 
+# the heuristic is that we mention the date as part of the rpm release flag if
+# (*) the package has requested it by setting package-RPMDATE (container packages should do that)
+# (*) or SVNPATH contains 'trunk' or 'branches' 
 # 
 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,)), \
-		yes)
+$(1).has-date = $(if $($(1)-RPMDATE),yes, \
+                  $(if $($($(1).module)-SVNPATH), \
+		     $(if $(findstring /trunk,$($($(1).module)-SVNPATH)),yes, \
+			$(if $(findstring /branches,$($($(1).module)-SVNPATH)),yes,)), \
+		     $(if $(findstring HEAD,$($($(1).module)-TAG)),yes,)))
 endef
 
 $(foreach package, $(ALL), $(eval $(call package_hasdate,$(package))))
 
+### the common header for generated specfiles
+# useful when trying new specfiles manually
+header.spec:
+	(echo -n "# Generated by planetlab build from $($(1)-SPEC) on " ; date) > $@
+	echo "%define distro $(DISTRO)" >> $@
+	echo "%define distrorelease $(RELEASE)" >> $@
+	echo "%define distroname $(DISTRONAME)" >> $@
+	echo "%define pldistro $(PLDISTRO)" >> $@
+	echo "%define plrelease $(PLANETLAB_RELEASE)" >> $@
+
 ### extract spec file from scm
 define target_spec
-$($(1).specpath):
+$($(1).specpath): header.spec
 	mkdir -p SPECS
-	(echo -n "# Generated by planetlab build from $($(1)-SPEC) on " ; date) > $($(1).specpath)
-	echo "%define distroname $(DISTRO)" >> $($(1).specpath)
-	echo "%define distrorelease $(RELEASE)" >> $($(1).specpath)
-	echo "%define pldistro $(PLDISTRO)" >> $($(1).specpath)
+	cat header.spec > $($(1).specpath)
 	$(if $($(1).has-date),echo "%define date $(shell date +%Y.%m.%d)" >> $($(1).specpath),)
 	$(if $($(1)-SPECVARS), \
 	  $(foreach line,$($(1)-SPECVARS), \
 	    echo "%define" $(word 1,$(subst =, ,$(line))) "$(word 2,$(subst =, ,$(line)))" >> $($(1).specpath) ;))
-	echo "# included from codebase specfile" >> $($(1).specpath)
+	echo "# included from $($(1)-SPEC)" >> $($(1).specpath)
 	$(if $($($(1).module)-SVNPATH),\
           svn cat $($($(1).module)-SVNPATH)/$($(1)-SPEC) >> $($(1).specpath) || rm $($(1).specpath),\
           cvs -d $($($(1).module)-CVSROOT) checkout \
@@ -422,41 +438,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
 
@@ -541,7 +567,7 @@ clean-help:
 
 ### brute force clean
 distclean1:
-	rm -rf pldistro.mk .rpmmacros spec2make SPECS MAKE 
+	rm -rf pldistro.mk .rpmmacros spec2make header.spec SPECS MAKE 
 distclean2:
 	rm -rf CODEBASES SOURCES BUILD RPMS SRPMS tmp
 distclean: distclean1 distclean2
@@ -554,6 +580,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 $@
@@ -563,17 +590,21 @@ 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)"
-	@echo    "Build trelease: $(RELEASE)"	
+	@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 planetlab-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-distroname: $(DISTRONAME)"
+	@echo    "Build target-release: $(RELEASE)"	
+	@echo    "Build target-personality: $(NIGHTLY_PERSONALITY)"	
 
 #################### 
 # for a given module
@@ -615,6 +646,39 @@ endif
 # only if present
 -include $(PLDISTROINSTALL)
 
+#################### package info
+PKGKEYS := tarballs source codebase srpm rpms rpmnames rpm-release rpm-name rpm-version rpm-subversion
+%-pkginfo: package=$(subst -pkginfo,,$@)
+%-pkginfo: 
+	@$(foreach key,$(PKGKEYS),echo "$(package).$(key)=$($(package).$(key))";)
+## rpm info
+RPMKEYS := rpm-path package
+%-rpminfo: rpm=$(subst -rpminfo,,$@)
+%-rpminfo: 
+	@$(foreach key,$(RPMKEYS),echo "$(rpm).$(key)=$($(rpm).$(key))";)
+
+#################### various lists - designed to run with stage1=true
+packages:
+	@$(foreach package,$(ALL), echo package=$(package) ref_module=$($(package).module) modules=$($(package)-MODULES) rpmnames=$($(package).rpmnames); )
+
+modules:
+	@$(foreach module,$(ALL-MODULES), echo module=$(module) svnpath=$($(module)-SVNPATH); )
+
+branches:
+	@$(foreach module,$(ALL-MODULES), \
+	  $(if $($(module)-SVNBRANCH),echo module=$(module) branch=$($(module)-SVNBRANCH);))
+
+module-tools:
+	@$(foreach module,$(ALL-MODULES), \
+ 	 $(if $($(module)-SVNPATH), \
+	  $(if $($(module)-SVNBRANCH), \
+	     echo $(module):$($(module)-SVNBRANCH); , \
+	     echo $(module); )))
+
+info: packages modules branches 
+
+.PHONY: info packages modules branches module-tools
+
 ####################
 help:
 	@echo "********** Run make in two stages:"
@@ -649,6 +713,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"
@@ -671,10 +740,15 @@ 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 info"
+	@echo "  is equivalent to make packages modules branches"
+	@echo "  provides various info on these objects"
+	@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 "make stage1=true PLDISTROTAGS=planetlab-tags-4.2.mk packages modules branches module-tools"
+	@echo "  Lists mentioned items - module-tools is used in modules.update"
 	@echo ""
 	@echo "********** Known pakages are"
 	@echo "$(ALL)"
@@ -688,13 +762,3 @@ help:
 +%: varname=$(subst +,,$@)
 +%:
 	@echo "$($(varname))"
-## package info
-PKGKEYS := tarballs source codebase srpm rpms rpmnames rpm-release rpm-name rpm-version rpm-subversion
-%.pkginfo: package=$(subst .pkginfo,,$@)
-%.pkginfo: 
-	@$(foreach key,$(PKGKEYS),echo "$(package).$(key)=$($(package).$(key))";)
-## rpm info
-RPMKEYS := rpm-path package
-%.rpminfo: rpm=$(subst .rpminfo,,$@)
-%.rpminfo: 
-	@$(foreach key,$(RPMKEYS),echo "$(rpm).$(key)=$($(rpm).$(key))";)