X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=a9fa61871acd8551f88c7b7075fe2ccefd53ffc6;hb=adeea08356880dc254ffd4bd8f51e47ed0d7b454;hp=36ccce9580169f1ca6fef32c05eb8b7f7ab20afa;hpb=27f3de64ea8060a3b21e3d4da24d5301fc5d194e;p=build.git diff --git a/Makefile b/Makefile index 36ccce95..a9fa6187 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/.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 # @@ -64,12 +56,19 @@ # a set of *packages* that this package depends on # (*) package-DEPEND-DEVEL-RPMS # a set of *rpms* that the build will rpm-install before building +# this is intended to denote local rpms, i.e. ones that are results of our own build +# stock rpms should be mentioned in config.planetlab/devel.pkgs # (*) 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' +# (*) 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) @@ -87,20 +86,30 @@ # # 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.3 + # # 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 +# uninstall -- cannot force rpm -e +# need to ignore result, kernel-headers cannot be uninstalled as glibc depends on it +RPM-UNINSTALL-DEVEL := rpm -e + +REMOTE-PLDISTROS="gnuradio" #################### Makefile # Default target @@ -112,9 +121,15 @@ PLDISTRO := planetlab RPMBUILD := rpmbuild export CVS_RSH := ssh -########## pldistro.mk holds PLDISTRO - it is generated at stage1 (see below) +########## savedpldistro.mk holds PLDISTRO - it is generated at stage1 (see below) ifeq "$(stage1)" "" -include pldistro.mk +include savedpldistro.mk +endif + +# when re-running the nightly build after failure, we need to gather the former values +# do this by running make stage1=skip +PLDISTRO +ifeq "$(stage1)" "skip" +include savedpldistro.mk endif #################### include onelab.mk @@ -127,32 +142,69 @@ include $(PLDISTROCONTENTS) PLDISTROTAGS := $(PLDISTRO)-tags.mk include $(PLDISTROTAGS) -########## stage1 and stage2 +# this used to be set in the -tags.mk files, but that turned out to require +# error-prone duplicate changes +# so now the nightly build script sets this to what it is currently using +# we set a default in case we run the build manually: +# if the local directory was svn checked out, then use the corresponding URL +svn-info-url-line := $(shell svn info 2> /dev/null | grep URL:) +default-build-SVNPATH := $(lastword $(svn-info-url-line)) +# otherwise, use this hard-coded default +ifeq "$(default-build-SVNPATH)" "" +default-build-SVNPATH := http://svn.planet-lab.org/svn/build/trunk +endif +# use default if necessary +build-SVNPATH ?= $(default-build-SVNPATH) + +#################### +define remote_pldistro +$(1).mk: config.$(1)/$(1).mk + @echo 'creating $(1) from config subdir' + cp config.$(1)/$(1).mk $(1).mk + +$(2).mk: config.$(1)/$(2).mk + @echo 'creating $(1) tags from config subdir' + cp config.$(1)/$(2).mk $(2).mk + +config.$(1)/$(1).mk: config.$(1) +config.$(1)/$(2).mk: config.$(1) + +config.$(1): config.$(1).svnpath + @echo "Fetching details for pldistro $(1)" + svn export $(shell grep -v "^#" config.$(1).svnpath) config.$(1) + +DISTCLEANS += $(1).mk $(2).mk config.$(1) + +endef + +$(eval $(call remote_pldistro,gnuradio,gnuradio-tags)) + +########## 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)" + @echo "========== stage1iter : $(package)" +# @echo "stage1iter : included .mk files : $(previousmks)" all: $($(package).specpath) all: MAKE/$(package).mk else @@ -163,10 +215,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 @@ -184,28 +236,10 @@ all: repo endif endif -#################### -# gather build information for the 'About' page -myplc-release: - @echo 'Creating myplc-release' - 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 -# 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/ @@ -224,47 +258,54 @@ repo: RPMS/yumgroups.xml # define stage1_variables $(1).spec = $(notdir $($(1)-SPEC)) -$(1).specpath = SPECS/$(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),) - echo "# included from codebase specfile" >> $($(1).specpath) $(if $($(1)-SPECVARS), \ $(foreach line,$($(1)-SPECVARS), \ 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),\ + 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)) - @if [ -z $($(1).specpath) ] ; then rm $($(1).specpath) ; exit 1 ; fi endef $(foreach package,$(ALL),$(eval $(call target_spec,$(package)))) @@ -289,9 +330,7 @@ endif rm -f $@ echo "%_topdir $(HOME)" >> $@ echo "%_tmppath $(HOME)/tmp" >> $@ - echo "%_netsharedpath /proc:/dev/pts" >> $@ - echo "%_install_langs C:de:en:es:fr" >> $@ - echo "%_excludedocs yes" >> $@ + ./getrpmmacros.sh >> $@ ### this utility allows to extract various info from a spec file ### and to define them in makefiles @@ -303,25 +342,41 @@ spec2make: spec2make.c define target_mk MAKE/$(1).mk: $($(1).specpath) spec2make .rpmmacros mkdir -p MAKE - ./spec2make $($(1)-RPMFLAGS) $($(1).specpath) $(1) > MAKE/$(1).mk - @if [ -z MAKE/$(1).mk ] ; then rm MAKE/$(1).mk ; exit 1 ; fi + ./spec2make $($(1)-RPMFLAGS) $($(1).specpath) $(1) > MAKE/$(1).mk || { rm MAKE/$(1).mk; exit 1; } endef $(foreach package,$(ALL),$(eval $(call target_mk,$(package)))) # stores PLDISTRO in a file # this is done at stage1. later run wont get confused -pldistro.mk: +savedpldistro.mk: echo "PLDISTRO:=$(PLDISTRO)" > $@ echo "PLDISTROTAGS:=$(PLDISTROTAGS)" >> $@ + echo "build-SVNPATH:=$(build-SVNPATH)" >> $@ + echo "PERSONALITY:=$(PERSONALITY)" >> $@ + echo "MAILTO:=$(MAILTO)" >> $@ + echo "BASE:=$(BASE)" >> $@ -savepldistro: pldistro.mk -.PHONY: savepldistro +savedpldistro: savedpldistro.mk +.PHONY: savedpldistro # always refresh this -all: savepldistro +all: savedpldistro + +#################### 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).tarballs)) tarballs: $(ALLTARBALLS) @@ -398,39 +453,32 @@ srpms: $(ALLSRPMS) @echo $(words $(ALLSRPMS)) source rpms OK .PHONY: srpms -define compute_devel_rpm_paths -$(1).all-devel-rpm-paths := $(foreach rpm,$($(1)-DEPEND-DEVEL-RPMS),$($(rpm).rpm-path)) -endef - -$(foreach package,$(ALL),$(eval $(call compute_devel_rpm_paths,$(package)))) - # usage: target_source_rpm package -# select upon the package name, whether it contains srpm or not define target_source_rpm -ifeq "$(subst srpm,,$(1))" "$(1)" +ifeq "$($(1)-BUILD-FROM-SRPM)" "" $($(1).srpm): $($(1).specpath) .rpmmacros $($(1).tarballs) mkdir -p BUILD SRPMS tmp @(echo -n "XXXXXXXXXXXXXXX -- BEG SRPM $(1) (using SOURCES) " ; date) $(if $($(1).all-devel-rpm-paths), $(RPM-INSTALL-DEVEL) $($(1).all-devel-rpm-paths)) - $(if $($(1)-RPMBUILD),\ - $($(1)-RPMBUILD) $($(1)-RPMFLAGS) -bs $($(1).specpath), - $(RPMBUILD) $($(1)-RPMFLAGS) -bs $($(1).specpath)) + $($(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 && \ + 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)))) -### rpmbuild invokation +### binary rpms are made from source rpm ALLRPMS:=$(foreach package,$(ALL),$($(package).rpms)) # same as above, mention $(ALL) and not $(ALLRPMS) rpms: $(ALLRPMS) @@ -439,42 +487,52 @@ 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-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)-RPMBUILD),\ - $($(1)-RPMBUILD) $($(1)-RPMFLAGS) --rebuild $(rpm_use_tmp_dirs) $($(1).srpm), \ - $(RPMBUILD) $($(1)-RPMFLAGS) --rebuild $(rpm_use_tmp_dirs) $($(1).srpm)) + $(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 @@ -493,11 +551,6 @@ endef $(foreach package,$(ALL),$(eval $(call target_dependfiles,$(package)))) ### package dependencies -define compute_devel_depends -$(1).depend-devel-packages := $(foreach rpm,$($(1)-DEPEND-DEVEL-RPMS),$($(rpm).package)) -endef -$(foreach package,$(ALL),$(eval $(call compute_devel_depends,$(package)))) - define package_depends_on_package $(1):$(2) $(1):$($(2).rpms) @@ -564,20 +617,50 @@ clean-help: ### brute force clean distclean1: - rm -rf pldistro.mk .rpmmacros spec2make SPECS MAKE + rm -rf savedpldistro.mk .rpmmacros spec2make header.spec SPECS MAKE $(DISTCLEANS) distclean2: rm -rf CODEBASES SOURCES BUILD RPMS SRPMS tmp 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 BASE here +# also store 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 $(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: $(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: $(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)") @@ -588,22 +671,60 @@ 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 + +#################### 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 + +#################### +tests_svnpath: + @$(if $(TESTS_SVNPATH), echo $(TESTS_SVNPATH) > $@, \ + echo "http://svn.planet-lab.org/svn/tests/trunk" > $@) -#################### include install Makefile -# the default is to use the distro-dependent install file -# however the main distro file can redefine PLDISTROINSTALL -ifndef PLDISTROINSTALL -PLDISTROINSTALL := $(PLDISTRO)-install.mk -endif -# only if present --include $(PLDISTROINSTALL) #################### help: @@ -639,11 +760,18 @@ 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" @echo "make distclean" @echo " brute-force cleaning, removes entire directories - requires a new stage1" + @echo "make develclean" + @echo " rpm-uninstalls all devel packages installed during build" @echo "" @echo "make iptables-distclean" @echo " deep clean for a given package" @@ -659,10 +787,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)" @@ -676,13 +809,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))";)