X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=04f5c4748547ae7f7c6312712a3db619d4eae4e7;hb=16b9ae6bdc65d43dd3588a0676190120b7888d56;hp=5de6d0717369b6681a89630baf935ecb932b8d8f;hpb=6cef1ac224a6b93d127b84b308ab22dfb32e031c;p=build.git

diff --git a/Makefile b/Makefile
index 5de6d071..04f5c474 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 ### $Id$
 # 
 ####################
-# invokation:
+# invocation:
 #
 # (*) make stage1=true
 #     this extracts all specfiles and computes .mk from specfiles
@@ -15,31 +15,25 @@
 #################### (fedora) distributions
 #
 # (*) as of nov. 2007, myplc-devel is deprecated
-# (*) instead, we create a fresh vserver that holds required tools (see e.g. planetlab-fc6-devel.lst)
+# (*) instead, we create a fresh vserver that holds required tools (see e.g. planetlab-devel.lst)
 # (*) the build uses the current fedora version as a target for the produced images
 # (*) so you simply need to create a fedora 8 build image for building fedora-8 images 
 #     
 #################### (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 mimick what's done for planetlab 
+# (*) see README-pldistros.txt
 # (*) then you need to run 
 #     make stage1=true PLDISTRO=onelab
 #
 #################### 
-# This build deals with 2 kinds of objects
+# This build deals with 3 kinds of objects
 # 
-# (*) packages are named upon the RPM name; they are moslty lowercase
+# (*) packages are named upon the RPM name; they are mostly lowercase
 #     Add a package to ALL if you want it built as part of the default set.
 # (*) modules are named after the subversion tree; as of this writing their names 
-#     are mostly mixedcase like MyPLC or Vserverreference
+#     are mostly mixed case like MyPLC or VserverReference
+# (*) rpms are named in the spec files. A package typically defines several rpms;
+#     rpms are used for defining DEPEND-DEVEL-RPMS. See also package.rpmnames
 # 
 #################### packages
 # basics: how to build a package - you need/may define the following variables
@@ -58,14 +52,18 @@
 #     packages defined BEFORE the current one (note: you should use = - as opposed to := - to define these)
 #     e.g. mydriver-SPECVARS = foo=$(kernel-rpm-release) 
 #     would let you use the %release from the kernel's package when rpmbuild'ing mydriver - see automatic below
-# (*) package-DEPENDS
+# (*) package-DEPEND-PACKAGES
 #     a set of *packages* that this package depends on
-# (*) package-DEPENDFILES
+# (*) package-DEPEND-DEVEL-RPMS
+#     a set of *rpms* that the build will rpm-install before building <package>
+# (*) 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 
 #     is refreshed with createrepo prior to running rpmbuild
 # (*) package-RPMFLAGS: Miscellaneous RPM flags
 # (*) 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'
 #
 #################### modules
 # Required information about the various modules (set this in e.g. planetlab-tags.mk)
@@ -74,42 +72,35 @@
 #     the complete path where this module lies; 
 #     you can specify the trunk or a given tag with this variable
 # 
-# OR if the module is managed under cvs
+# OR if the module is managed under cvs (will be obsoleted)
 # 
 # (*) module-CVSROOT
 # (*) module-TAG
 #
 #################### automatic variables
 #
-# the build defines the following make variables - these are extracted from spec files
-# (*) package-TARBALL : from the Source<n>: declaration
-#     example: kernel-i386-TARBALL = SOURCES/linux-2.6.20.tar.bz2
-# (*) package-SOURCE : 
-#     example: kernel-i386-SOURCE = SOURCES/linux-2.6.20
-# (*) package-SRPM
-#     example: kernel-i386-SRPM = SRPMS/kernel-2.6.20-1.2949.fc6.vs2.2.0.1.0.planetlab.src.rpm
-# (*) package-RPM
-#     example: kernel-i386-RPM = \
-#	RPMS/i686/kernel-2.6.20-1.2949.fc6.vs2.2.0.1.0.planetlab.i686.rpm \
-#	RPMS/i686/kernel-devel-2.6.20-1.2949.fc6.vs2.2.0.1.0.planetlab.i686.rpm \
-#	RPMS/i686/kernel-vserver-2.6.20-1.2949.fc6.vs2.2.0.1.0.planetlab.i686.rpm \
-#	RPMS/i686/kernel-debuginfo-2.6.20-1.2949.fc6.vs2.2.0.1.0.planetlab.i686.rpm
-# (*) package-rpm-name
-#     example: kernel-i386-rpm-name = kernel
-# (*) package-rpm-release
-#     example: kernel-i386-rpm-release = 1.2949.fc6.vs2.2.0.1.0.planetlab
-# (*) package-version
-#     example: kernel-i386-rpm-version = 2.6.20
-# (*) package-subversion
-#     example: myplc-rpm-subversion = 15
+# the build defines some make variables that are extracted from spec files
+# see for example
+# (*)  $ 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
+#
 ####################
 
+# exported to spec files as plrelease
+PLANETLAB_RELEASE = 4.2
+
 #
 # Default values
 #
 HOSTARCH := $(shell uname -i)
 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
 
 #################### Makefile
 # Default target
@@ -136,33 +127,33 @@ include $(PLDISTROCONTENTS)
 PLDISTROTAGS := $(PLDISTRO)-tags.mk
 include $(PLDISTROTAGS)
 
-########## stage1 and stage2
+########## stage1 and stage1iter
 # extract specs and compute .mk files by running 
 # make stage1=true
 # entering stage1, we compute all the spec files
-# then we use stage2 to compute the .mk iteratively, 
+# then we use stage1iter to compute the .mk iteratively, 
 # ensuring that the n-1 first makefiles are loaded when creating the n-th one
-# when stage2 is set, it is supposed to be an index (starting at 1) in $(ALL)
+# when stage1iter is set, it is supposed to be an index (starting at 1) in $(ALL)
 
 ALLMKS := $(foreach package, $(ALL), MAKE/$(package).mk)
 
-### stage2 : need some arithmetic, see
+### stage1iter : need some arithmetic, see
 # http://www.cmcrossroads.com/articles/ask-mr.-make/learning-gnu-make-functions-with-arithmetic.html
-ifneq "$(stage2)" ""
+ifneq "$(stage1iter)" ""
 # the first n packages
-packages := $(wordlist 1,$(words $(stage2)),$(ALL))
+packages := $(wordlist 1,$(words $(stage1iter)),$(ALL))
 # the n-th package
 package := $(word $(words $(packages)),$(packages))
 # the n-1 first packages
-stage2_1 := $(wordlist 2,$(words $(stage2)),$(stage2))
-previous := $(wordlist 1,$(words $(stage2_1)),$(ALL))
+stage1iter_1 := $(wordlist 2,$(words $(stage1iter)),$(stage1iter))
+previous := $(wordlist 1,$(words $(stage1iter_1)),$(ALL))
 previousmks := $(foreach package,$(previous),MAKE/$(package).mk)
 include $(previousmks)
 all: verbose
 verbose:
-	@echo "========== stage2 : $(package)"
-#	@echo "stage2 : included .mk files : $(previousmks)"
-all: $($(package)_specpath)
+	@echo "========== stage1iter : $(package)"
+#	@echo "stage1iter : included .mk files : $(previousmks)"
+all: $($(package).specpath)
 all: MAKE/$(package).mk
 else
 ### stage1
@@ -172,10 +163,10 @@ verbose :
 	@echo "========== stage1"
 all : spec2make
 all : .rpmmacros
-# specs and makes are done sequentially by stage2
-all : stage2
-stage2:
-	arg=""; for n in $(ALL) ; do arg="$$arg x"; $(MAKE) --no-print-directory stage2="$$arg"; done
+# specs and makes are done sequentially by stage1iter
+all : stage1iter
+stage1iter:
+	arg=""; for n in $(ALL) ; do arg="$$arg x"; $(MAKE) --no-print-directory stage1iter="$$arg"; done
 ### regular make
 else
 ### once .mks are OK, you can run make normally
@@ -188,24 +179,22 @@ include $(ALLMKS)
 # mention $(ALL) here rather than rpms 
 # this is because the inter-package dependencies are expressed like
 # util-vserver: util-python
-all: $(ALL)
-all: srpms
+all: rpms
+all: repo
 endif
 endif
 
-####################
-# gather build information for the 'About' page
-SOURCES/myplc-release:
-	@echo 'Creating myplc-release'
-	mkdir -p SOURCES
-	rm -f $@
-	(echo -n 'Build bdate: ' ; date '+%Y.%m.%d') >> $@
-	(echo -n 'Build btime: ' ; date '+%H:%M') >> $@
-	(echo -n 'Build hostname: ' ; hostname) >> $@
-	(echo -n 'Build location: ' ; pwd) >> $@
-	(echo -n 'Build tags file: ' ; fgrep '$$''Id' $(PLDISTROTAGS)) >> $@
-	echo "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx modules versions info" >> $@
-	$(MAKE) --no-print-directory versions >> $@
+### yumgroups.xml : compute from all known .pkgs files
+RPMS/yumgroups.xml: 
+	mkdir -p RPMS
+	./yumgroups.sh $(PLDISTRO) > $@
+
+createrepo = createrepo --quiet -g yumgroups.xml RPMS/ 
+
+repo: RPMS/yumgroups.xml
+	$(createrepo)
+
+.PHONY: repo
 
 ####################
 # notes: 
@@ -216,9 +205,10 @@ SOURCES/myplc-release:
 # <module>/<module>.spec while svn modules just define it as <module>.spec
 #
 define stage1_variables
-$(1)_spec = $(notdir $($(1)-SPEC))
-$(1)_specpath = SPECS/$(notdir $($(1)-SPEC))
-$(1)_module = $(firstword $($(1)-MODULES))
+$(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))))
@@ -227,56 +217,80 @@ $(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
 # 
 define package_hasdate
-$(1)_hasdate = $(if $(subst myplc,,$(1)), \
-	          $(if $($(1)-SVNPATH),\
-		     $(if $(findstring /trunk,$($(1)-SVNPATH)),yes,),\
-		     $(if $(findstring HEAD,$($(1)-TAG)),yes,)), \
+$(1).has-date = $(if $(subst myplc,,$(1)), \
+	          $(if $($($(1).module)-SVNPATH),\
+		     $(if $(findstring /trunk,$($($(1).module)-SVNPATH)),yes,),\
+		     $(if $(findstring HEAD,$($($(1).module)-TAG)),yes,)), \
 		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
-# usage: extract_spec_file package 
-# see early releases for comments on other possible implementations
-# cannot use variables in such rules, we need to inline everything, sigh
 define target_spec
-$($(1)_specpath):
+$($(1).specpath): header.spec
 	mkdir -p SPECS
-	echo "%define pldistro $(PLDISTRO)" > $($(1)_specpath)
-	$(if $($(1)_hasdate),echo "%define date $(shell date +%Y.%m.%d)" >> $($(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) ;))
-	$(if $($($(1)_module)-SVNPATH),\
-          svn cat $($($(1)_module)-SVNPATH)/$($(1)-SPEC) >> $($(1)_specpath),\
-          cvs -d $($($(1)_module)-CVSROOT) checkout \
-	      -r $($($(1)_module)-TAG) \
-	      -p $($(1)_module)/$($(1)-SPEC) >> $($(1)_specpath))
-	@if [ -z $($(1)_specpath) ] ; then rm $($(1)_specpath) ; exit 1 ; fi
+	    echo "%define" $(word 1,$(subst =, ,$(line))) "$(word 2,$(subst =, ,$(line)))" >> $($(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 \
+	      -r $($($(1).module)-TAG) \
+	      -p $($(1).module)/$($(1)-SPEC) >> $($(1).specpath))
 endef
 
 $(foreach package,$(ALL),$(eval $(call target_spec,$(package))))
 
+###
+# Base rpmbuild in the current directory
+# issues on fedora 8 : see the following posts
+# http://forums.fedoraforum.org/showthread.php?t=39625 - and more specifically post#6
+# https://www.redhat.com/archives/fedora-devel-list/2007-November/msg00171.html
+REALROOT=/build
+FAKEROOT=/longbuildroot
+PWD=$(shell /bin/pwd)
+ifeq "$(PWD)" "$(REALROOT)"
+export HOME := $(FAKEROOT)
+else
+export HOME := $(PWD)
+endif
+.rpmmacros:
+ifeq "$(shell pwd)" "/build"
+	rm -f $(FAKEROOT) ; ln -s $(REALROOT) $(FAKEROOT)
+endif
+	rm -f $@ 
+	echo "%_topdir $(HOME)" >> $@
+	echo "%_tmppath $(HOME)/tmp" >> $@
+	./getrpmmacros.sh >> $@
+
 ### this utility allows to extract various info from a spec file
 ### and to define them in makefiles
 spec2make: spec2make.c
 	$(CC) -g -Wall $< -o $@ -lrpm -lrpmbuild
 
-# Base rpmbuild in the current directory
-export HOME := $(shell pwd)
-.rpmmacros:
-	echo "%_topdir $(HOME)" > $@
-	echo "%_tmppath $(HOME)/tmp" >> $@
-
 ### run spec2make on the spec file and include the result
 # usage: spec2make package
 define target_mk
-MAKE/$(1).mk: $($(1)_specpath) spec2make .rpmmacros
+MAKE/$(1).mk: $($(1).specpath) spec2make .rpmmacros
 	mkdir -p MAKE
-	./spec2make $($(1)-RPMFLAGS) $($(1)_specpath) $(1) > MAKE/$(1).mk
+	./spec2make $($(1)-RPMFLAGS) $($(1).specpath) $(1) > MAKE/$(1).mk
 	@if [ -z MAKE/$(1).mk ] ; then rm MAKE/$(1).mk ; exit 1 ; fi
 endef
 
@@ -294,9 +308,22 @@ savepldistro: pldistro.mk
 # always refresh this
 all: savepldistro
 
-####################
+#################### regular make
+
+define stage2_variables
+### devel dependencies
+$(1).rpmbuild = $(if $($(1)-RPMBUILD),$($(1)-RPMBUILD),$(RPMBUILD)) $($(1)-RPMFLAGS)
+$(1).all-devel-rpm-paths := $(foreach rpm,$($(1)-DEPEND-DEVEL-RPMS),$($(rpm).rpm-path))
+$(1).depend-devel-packages := $(sort $(foreach rpm,$($(1)-DEPEND-DEVEL-RPMS),$($(rpm).package)))
+ALL-DEVEL-RPMS += $($(1)-DEPEND-DEVEL-RPMS)
+endef
+
+$(foreach package,$(ALL),$(eval $(call stage2_variables,$(package))))
+ALL-DEVEL-RPMS := $(sort $(ALL-DEVEL-RPMS))
+
+
 ### pack sources into tarballs
-ALLTARBALLS:= $(foreach package, $(ALL), $($(package)-TARBALL))
+ALLTARBALLS:= $(foreach package, $(ALL), $($(package).tarballs))
 tarballs: $(ALLTARBALLS)
 	@echo $(words $(ALLTARBALLS)) source tarballs OK
 .PHONY: tarballs
@@ -310,10 +337,17 @@ SOURCES/%.tar.gz: SOURCES/%
 SOURCES/%.tgz: SOURCES/%
 	tar chpzf $@ -C SOURCES $*
 
+##
+URLS/%: url=$(subst @colon@,:,$(subst @slash@,/,$(notdir $@)))
+URLS/%: basename=$(notdir $(url))
+URLS/%: 
+	echo curl $(url) -o SOURCES/$(basename)
+	touch $@
+
 ### the directory SOURCES/<package>-<version> is made 
 # with a copy -rl from CODEBASES/<package>
-# the former is $(package-SOURCE) and the latter is $(package-CODEBASE)
-ALLSOURCES:=$(foreach package, $(ALL), $($(package)-SOURCE))
+# the former is $(package.source) and the latter is $(package.codebase)
+ALLSOURCES:=$(foreach package, $(ALL), $($(package).source))
 # so that make does not use the rule below directly for creating the tarball files
 .SECONDARY: $(ALLSOURCES)
 
@@ -322,13 +356,13 @@ sources: $(ALLSOURCES)
 .PHONY: sources
 
 define target_link_codebase_sources
-$($(1)-SOURCE): $($(1)-CODEBASE) ; mkdir -p SOURCES ; cp -rl $($(1)-CODEBASE) $($(1)-SOURCE)
+$($(1).source): $($(1).codebase) ; mkdir -p SOURCES ; cp -rl $($(1).codebase) $($(1).source)
 endef
 
 $(foreach package,$(ALL),$(eval $(call target_link_codebase_sources,$(package))))
 
 ### codebase extraction
-ALLCODEBASES:=$(foreach package, $(ALL), $($(package)-CODEBASE))
+ALLCODEBASES:=$(foreach package, $(ALL), $($(package).codebase))
 # so that make does not use the rule below directly for creating the tarball files
 .SECONDARY: $(ALLCODEBASES)
 
@@ -340,7 +374,7 @@ codebases : $(ALLCODEBASES)
 # usage: extract_single_module package 
 define extract_single_module
 	mkdir -p CODEBASES
-	$(if $($($(1)_module)-SVNPATH), cd CODEBASES && svn export $($($(1)_module)-SVNPATH) $(1), cd CODEBASES && cvs -d $($($(1)_module)-CVSROOT) export -r $($($(1)_module)-TAG) -d $(1) $($(1)_module))
+	$(if $($($(1).module)-SVNPATH), cd CODEBASES && svn export $($($(1).module)-SVNPATH) $(1), cd CODEBASES && cvs -d $($($(1).module)-CVSROOT) export -r $($($(1).module)-TAG) -d $(1) $($(1).module))
 endef
 
 # usage: extract_multi_module package 
@@ -358,130 +392,162 @@ CODEBASES/%:
 	  $(call extract_single_module,$(package)))
 	@(echo -n "XXXXXXXXXXXXXXX -- END CODEBASE $(package) : $@ " ; date)
 
-### rpmbuild invokation
-ALLRPMS:=$(foreach package,$(ALL),$($(package)-RPM))
-# same as above, mention $(ALL) and not $(ALLRPMS)
-rpms: $(ALL)
-	@echo $(words $(ALLRPMS)) binary rpms OK
-.PHONY: rpms
-
-# usage: build_binary_rpm package
-# xxx hacky - invoke createrepo if DEPENDFILES mentions RPMS/yumgroups.xml
-define target_binary_rpm 
-$($(1)-RPM): $($(1)_specpath) $($(1)-TARBALL) .rpmmacros
-	mkdir -p BUILD RPMS tmp
-	@(echo -n "XXXXXXXXXXXXXXX -- BEG RPM $(1) " ; date)
-	$(if $(findstring RPMS/yumgroups.xml,$($(1)-DEPENDFILES)), createrepo --quiet -g yumgroups.xml RPMS/ , )
-	$(if $($(1)-RPMBUILD),\
-	  $($(1)-RPMBUILD) $($(1)-RPMFLAGS) -bb $($(1)_specpath), \
-	  $(RPMBUILD)  $($(1)-RPMFLAGS) -bb $($(1)_specpath))
-	@(echo -n "XXXXXXXXXXXXXXX -- END RPM $(1) " ; date)
-endef
-
-$(foreach package,$(ALL),$(eval $(call target_binary_rpm,$(package))))
-
 ### source rpms
-ALLSRPMS:=$(foreach package,$(ALL),$($(package)-SRPM))
+ALLSRPMS:=$(foreach package,$(ALL),$($(package).srpm))
 srpms: $(ALLSRPMS)
 	@echo $(words $(ALLSRPMS)) source rpms OK
 .PHONY: srpms
 
-# usage: build_source_rpm package
+# usage: target_source_rpm package
+# select upon the package name, whether it contains srpm or not
 define target_source_rpm 
-$($(1)-SRPM): $($(1)_specpath) $($(1)-TARBALL) .rpmmacros
+ifeq "$($(1)-BUILD-FROM-SRPM)" ""
+$($(1).srpm): $($(1).specpath) .rpmmacros $($(1).tarballs) 
 	mkdir -p BUILD SRPMS tmp
-	@(echo -n "XXXXXXXXXXXXXXX -- BEG SRPM $(1) " ; date)
-	$(if $($(1)-RPMBUILD),\
-	  $($(1)-RPMBUILD) $($(1)-RPMFLAGS) -bs $($(1)_specpath),
-	  $(RPMBUILD) $($(1)-RPMFLAGS) -bs $($(1)_specpath))	
+	@(echo -n "XXXXXXXXXXXXXXX -- BEG SRPM $(1) (using SOURCES) " ; date)
+	$(if $($(1).all-devel-rpm-paths), $(RPM-INSTALL-DEVEL) $($(1).all-devel-rpm-paths))
+	$($(1).rpmbuild) -bs $($(1).specpath)
+	$(if $($(1)-DEPEND-DEVEL-RPMS), $(RPM-UNINSTALL-DEVEL) $($(1)-DEPEND-DEVEL-RPMS))
 	@(echo -n "XXXXXXXXXXXXXXX -- END SRPM $(1) " ; date)
+else
+$($(1).srpm): $($(1).specpath) .rpmmacros $($(1).codebase)
+	mkdir -p BUILD SRPMS tmp
+	@(echo -n "XXXXXXXXXXXXXXX -- BEG SRPM $(1) (using make srpm) " ; date)
+	$(if $($(1).all-devel-rpm-paths), $(RPM-INSTALL-DEVEL) $($(1).all-devel-rpm-paths))
+	make -C $($(1).codebase) srpm SPECFILE=$(HOME)/$($(1).specpath) && \
+           rm -f SRPMS/$(notdir $($(1).srpm)) && \
+           ln $($(1).codebase)/$(notdir $($(1).srpm)) SRPMS/$(notdir $($(1).srpm)) 
+	$(if $($(1)-DEPEND-DEVEL-RPMS), $(RPM-UNINSTALL-DEVEL) $($(1)-DEPEND-DEVEL-RPMS))
+	@(echo -n "XXXXXXXXXXXXXXX -- END SRPM $(1) " ; date)
+endif
 endef
 
 $(foreach package,$(ALL),$(eval $(call target_source_rpm,$(package))))
 
-### RPMS/yumgroups.xml
-ifndef YUMGROUPS
-YUMGROUPS := groups/$(PLDISTRO).xml
-endif
-RPMS/yumgroups.xml: $(YUMGROUPS)
-	install -D -m 644 $(YUMGROUPS) $@
+### binary rpms are made from source rpm
+ALLRPMS:=$(foreach package,$(ALL),$($(package).rpms))
+# same as above, mention $(ALL) and not $(ALLRPMS)
+rpms: $(ALLRPMS)
+	@echo $(words $(ALLRPMS)) binary rpms OK
+.PHONY: rpms
+
+# 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 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)-RPM)
+$(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)-TARBALL)
+$(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)-rpm: $($(package)-RPM)
-.PHONY: $(1)-rpm
-$(1)-srpm: $($(package)-SRPM)
+$(1)-rpms: $($(1).rpms)
+.PHONY: $(1)-rpms
+$(1)-srpm: $($(1).srpm)
 .PHONY: $(1)-srpm
 endef
 
 $(foreach package,$(ALL),$(eval $(call target_shorthand,$(package))))
 
-### dependencies
+### file dependencies
 define package_depends_on_file
 $(1):$(2)
-$($(1)-RPM):$(2)
+$($(1).srpm):$(2)
 endef
 
 define target_dependfiles
-$(foreach file,$($(1)-DEPENDFILES),$(eval $(call package_depends_on_file,$(1),$(file))))
+$(foreach file,$($(1)-DEPEND-FILES),$(eval $(call package_depends_on_file,$(1),$(file))))
 endef
 
+$(foreach package,$(ALL),$(eval $(call target_dependfiles,$(package))))
+
+### package dependencies
 define package_depends_on_package
 $(1):$(2)
-$(1):$($(2)-RPM)
-$($(1)-RPM):$($(2)-RPM)
+$(1):$($(2).rpms)
+$($(1).srpm):$($(2).rpms)
 endef
 
 define target_depends
-$(foreach package,$($(1)-DEPENDS),$(eval $(call package_depends_on_package,$(1),$(package))))
+$(foreach package,$($(1)-DEPEND-PACKAGES) $($(1).depend-devel-packages),$(eval $(call package_depends_on_package,$(1),$(package))))
 endef
 
 $(foreach package,$(ALL),$(eval $(call target_depends,$(package))))
-$(foreach package,$(ALL),$(eval $(call target_dependfiles,$(package))))
-
 
 ### clean target
 # usage: target_clean package
 define target_clean
 $(1)-clean-codebase:
-	rm -rf $($(1)-CODEBASE)
+	rm -rf $($(1).codebase)
 .PHONY: $(1)-clean-codebase
 CLEANS += $(1)-clean-codebase
 $(1)-clean-source:
-	rm -rf $($(1)-SOURCE)
+	rm -rf $($(1).source)
 .PHONY: $(1)-clean-source
 CLEANS += $(1)-clean-source
 $(1)-clean-tarball:
-	rm -rf $($(1)-TARBALL)
+	rm -rf $($(1).tarballs)
 .PHONY: $(1)-clean-tarball
 CLEANS += $(1)-clean-tarball
 $(1)-clean-build:
-	rm -rf BUILD/$(notdir $($(1)-SOURCE))
+	rm -rf BUILD/$(notdir $($(1).source))
 CLEANS += $(1)-clean-build
-$(1)-clean-rpm:
-	rm -rf $($(1)-RPM)
-.PHONY: $(1)-clean-rpm
-CLEANS += $(1)-clean-rpm
+$(1)-clean-rpms:
+	rm -rf $($(1).rpms)
+.PHONY: $(1)-clean-rpms
+CLEANS += $(1)-clean-rpms
 $(1)-clean-srpm:
-	rm -rf $($(1)-SRPM)
+	rm -rf $($(1).srpm)
 .PHONY: $(1)-clean-srpm
 CLEANS += $(1)-clean-srpm
-$(1)-clean: $(1)-clean-codebase $(1)-clean-source $(1)-clean-tarball $(1)-clean-build $(1)-clean-rpm $(1)-clean-srpm
-.PHONY: $(1)-clean
+$(1)-codeclean: $(1)-clean-source $(1)-clean-tarball $(1)-clean-build $(1)-clean-rpms $(1)-clean-srpm
+$(1)-clean: $(1)-clean-codebase $(1)-codeclean
+.PHONY: $(1)-codeclean $(1)-clean 
+$(1)-clean-spec:
+	rm -rf $($(1).specpath)
+.PHONY: $(1)-clean-spec
+$(1)-clean-make:
+	rm -rf MAKE/$(1).mk
+.PHONY: $(1)-clean-make
+$(1)-distclean: $(1)-distclean1 $(1)-distclean2
+$(1)-distclean1: $(1)-clean-spec $(1)-clean-make
+$(1)-distclean2: $(1)-clean
+.PHONY: $(1)-distclean $(1)-distclean1 $(1)-distclean2
 endef
 
 $(foreach package,$(ALL),$(eval $(call target_clean,$(package))))
@@ -503,14 +569,44 @@ distclean2:
 distclean: distclean1 distclean2
 .PHONY: distclean1 distclean2 distclean
 
-# xxx tmp - I cannot use this on my mac for local testing
-ISMACOS=$(findstring Darwin,$(shell uname))
-ifneq "$(ISMACOS)" ""
-#################### produce reliable version information
+develclean:
+	$(RPM-UNINSTALL-DEVEL) $(ALL-DEVEL-RPMS)
+
+####################
+# 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 $@
+	echo "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx build info" >> $@
+	$(MAKE) --no-print-directory version-build >> $@
+	echo "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx svn info" >> $@
+	$(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 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
 VFORMAT="%30s := %s\n"
-define print_version
-$(1)-version:
+define svn_version_target
+$(1)-version-svn:
 	@$(if $($(1)-SVNPATH),\
 	   printf $(VFORMAT) $(1)-SVNPATH "$($(1)-SVNPATH)",\
 	   printf $(VFORMAT) $(1)-CVSROOT "$($(1)-CVSROOT)" ; printf $(VFORMAT) $(1)-TAG "$($(1)-TAG)")
@@ -521,13 +617,21 @@ ALL-MODULES :=
 $(foreach package,$(ALL), $(eval ALL-MODULES+=$($(package)-MODULES)))
 ALL-MODULES:=$(sort $(ALL-MODULES))
 
-$(foreach module,$(ALL-MODULES), $(eval $(call print_version,$(module))))
+$(foreach module,$(ALL-MODULES), $(eval $(call svn_version_target,$(module))))
 
-versions: $(foreach module, $(ALL-MODULES), $(module)-version)
-else
-versions:
-	@echo "warning : the 'versions' target is not supported on macos"
-endif
+version-svns: $(foreach module, $(ALL-MODULES), $(module)-version-svn)
+
+RFORMAT="%20s :: version=%s release=%s\n"
+define rpm_version_target
+$(1)-version-rpm:
+	@printf $(RFORMAT) $($(1).rpm-name) $($(1).rpm-version) $($(1).rpm-release)
+version-rpms: $(1)-version-rpm
+endef
+
+$(foreach package,$(sort $(ALL)), $(eval $(call rpm_version_target,$(package))))
+
+versions: myplc-release version-build version-svns version-rpms
+.PHONY: versions version-build version-rpms version-svns
 
 #################### include install Makefile
 # the default is to use the distro-dependent install file
@@ -540,49 +644,72 @@ endif
 
 ####################
 help:
-	@echo "Known pakages are"
-	@echo "  $(ALL)"
-	@echo "Run make in two stages:"
+	@echo "********** Run make in two stages:"
 	@echo ""
 	@echo "make stage1=true PLDISTRO=onelab"
 	@echo " -> extracts all spec files in SPECS/ and mk files in MAKE/"
 	@echo "    as well as save PLDISTRO for subsequent runs"
 	@echo ""
-	@echo "Then you can use the following targets"
-	@echo '$ make'
+	@echo "********** Then you can use the following targets"
+	@echo 'make'
 	@echo "  rebuilds everything"
-	@echo '$ make util-vserver'
+	@echo 'make util-vserver'
 	@echo "  makes the RPMS related to util-vserver"
-	@echo "  equivalent to 'make util-vserver-rpm'"
+	@echo "  equivalent to 'make util-vserver-rpms'"
 	@echo ""
-	@echo "Or, vertically - step-by-step for a given package"
-	@echo '$ make util-vserver-codebase'
+	@echo "********** Or, vertically - step-by-step for a given package"
+	@echo 'make util-vserver-codebase'
 	@echo "  performs codebase extraction in CODEBASES/util-vserver"
-	@echo '$ make util-vserver-source'
+	@echo 'make util-vserver-source'
 	@echo "  creates source link in SOURCES/util-vserver-<version>"
-	@echo '$ make util-vserver-tarball'
+	@echo 'make util-vserver-tarball'
 	@echo "  creates source tarball in SOURCES/util-vserver-<version>.<tarextension>"
-	@echo '$ make util-vserver-rpm'
-	@echo "  build rpm(s) in RPMS/"
-	@echo '$ make util-vserver-srpm'
+	@echo 'make util-vserver-srpm'
 	@echo "  build source rpm in SRPMS/"
+	@echo 'make util-vserver-rpms'
+	@echo "  build rpm(s) in RPMS/"
 	@echo ""
-	@echo "Or, horizontally, reach a step for all known packages"
-	@echo '$ make codebases'
-	@echo '$ make sources'
-	@echo '$ make tarballs'
-	@echo '$ make rpms'
-	@echo '$ make srpms'
+	@echo "********** Or, horizontally, reach a step for all known packages"
+	@echo 'make codebases'
+	@echo 'make sources'
+	@echo 'make tarballs'
+	@echo 'make srpms'
+	@echo 'make rpms'
 	@echo ""
-	@echo "Cleaning examples"
-	@echo "$ make clean"
+	@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"
-	@echo "$ make distclean"
+	@echo "make distclean"
 	@echo "  brute-force cleaning, removes entire directories - requires a new stage1"
-	@echo "$ make util-vserver-clean"
+	@echo "make develclean"
+	@echo "  rpm-uninstalls all devel packages installed during build"
+	@echo ""
+	@echo "make iptables-distclean"
+	@echo "  deep clean for a given package"
+	@echo "make iptables-codeclean"
+	@echo "  run this if you've made a change in the CODEBASES area for iptables"
+	@echo ""
+	@echo "make util-vserver-clean"
 	@echo "  removes codebase, source, tarball, build, rpm and srpm for util-vserver"
-	@echo "$ make util-vserver-clean-codebase"
+	@echo "make util-vserver-clean-codebase"
 	@echo "  and so on for source, tarball, build, rpm and srpm"
+	@echo ""
+	@echo "********** Info examples"
+	@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 "  Displays know attributes of a package"
+	@echo "make kernel-devel-rpminfo"
+	@echo "  Displays know attributes of an rpm"
+	@echo ""
+	@echo "********** Known pakages are"
+	@echo "$(ALL)"
 
 #################### convenience, for debugging only
 # make +foo : prints the value of $(foo)
@@ -593,3 +720,13 @@ 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))";)