X-Git-Url: http://git.onelab.eu/?p=build.git;a=blobdiff_plain;f=Makefile;h=a214aa079e279cebc211e4ba738242942cda3e5e;hp=8eb944025305a9f5e3fa13e974b491c0da2a644d;hb=9770ae10ecdfae9bdcaa1232ac47c94d4b1891ee;hpb=1c24f489201689afb53722f2322431c9b9c18ae6 diff --git a/Makefile b/Makefile index 8eb94402..a214aa07 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # -# Thierry Parmentelat - INRIA Sophia Antipolis +# Thierry Parmentelat - INRIA Sophia Antipolis # #################### # invocation: @@ -15,33 +15,33 @@ # (*) as of nov. 2007, myplc-devel is deprecated # (*) 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 -# +# (*) so you simply need to create a fedora 8 build image for building fedora-8 images +# #################### (planetlab) distributions # # (*) see README-pldistros.txt -# (*) then you need to run +# (*) then you need to run # make stage1=true PLDISTRO=onelab # -#################### +#################### # This build deals with 3 kinds of objects -# +# # (*) 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 or git tree; we would wish to keep # these names lowercase as far as possible # (*) 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 -# +# rpms are used for defining LOCAL-DEVEL-RPMS. See also package.rpmnames +# # in simple cases, one package uses one module (in which case using the same name sounds right) -# but others might need several modules (e.g. image-creation packages like bootstrapfs need -# bootstrapfs and build); in this case the FIRST ONE is used for locating the specfile +# but others might need several modules (e.g. image-creation packages like bootstrapfs need +# bootstrapfs and build); in this case the FIRST ONE is used for locating the specfile # #################### packages # basics: how to build a package - you need to define the following variables -# +# # (*) package-MODULES -# a package needs one or several modules to build; the first one is used for +# a package needs one or several modules to build; the first one is used for # some special purposes, like locating the specfile # (*) package-SPEC # the package's specfile; this is relative to the FIRST module in package-MODULES @@ -52,38 +52,36 @@ # a set of (obviously local) *packages* that this package depends on, e.g. # bootstrapfs-DEPEND-PACKAGES += kernel # this impacts the order of the build -# (*) package-DEVEL-RPMS +# (*) package-STOCK-DEVEL-RPMS # a set of stock rpms that this package needs at build-time # this can also be set in config./devel.pkgs or config.planetlab/devel.pkgs as appropriate -# (*) package-EXCLUDE-DEVEL-RPMS -# a set of stock *rpms* that the build will rpm-uninstall before building -# this is intended to denote stock rpms, and the build will attempt to yum-install them -# back after the package is rebuilt -# This feature is not used at the moment and kept only just in case -# (*) package-DEPEND-DEVEL-RPMS -# a set of local *rpms* that the build will rpm-install before building +# (*) package-LOCAL-DEVEL-RPMS +# a set of *local* rpms that the build will rpm-install before building # the build will attempt to uninstall those once the package is built, this is not fatal though # this is intended to denote local rpms, i.e. ones that are results of our own build -# stock rpms should be mentioned in DEVEL-RPMS or in devel.pkgs as described above +# stock rpms should be mentioned in STOCK-DEVEL-RPMS or in devel.pkgs as described above +# (*) package-LOCAL-DEVEL-RPMS-CRUCIAL +# like package-LOCAL-DEVEL-RPMS but for crucial packages (like autoconf) that only need an update from our build +# rpms in this area will *not* be uninstalled after the target is made, because that would ruin the build vm for good # (*) 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 +# if this contains RPMS/yumgroups.xml, then the toplevel RPMS's index # is refreshed with createrepo prior to running rpmbuild # (*) package-SPECVARS -# space-separated list of spec variable definitions, where you can reference make variables that -# belong to packages defined BEFORE the current one +# space-separated list of spec variable definitions, where you can reference make variables that +# belong to packages defined BEFORE the current one # note: you should use = to define these (as opposed to :=) -# e.g. mydriver-SPECVARS = foo=$(kernel-rpm-release) -# would let you use the %release from the kernel's package when rpmbuild'ing mydriver +# 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-RPMFLAGS: Miscellaneous RPM flags # this is passed to rpmbuild, as well as to spec2make for "exporting" various rpm variable # to make; beware that some features, like --with=debug or --define 'foo bar' are not # well handled by spec2make as of this writing, which can cause issues. # hopefully this will be fixed... -# (*) package-BUILD-FROM-SRPM: set this to any non-empty value, -# if your package is able to produce a source rpm. -# In this case the build will first invoke 'make srpm', and then rebuild binaries from that +# (*) package-BUILD-FROM-SRPM: set this to any non-empty value, +# if your package is able to produce a source rpm. +# In this case the build will first invoke 'make srpm', and then rebuild binaries from that # (*) 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 @@ -93,9 +91,9 @@ # # (*) module-SVNPATH # for svn modules -# the complete path where this module lies; +# the complete path where this module lies; # you can specify the trunk or a given tag with this variable -# +# # (*) module-GITPATH # for git modules # which by analogy with svn revision scheme, is expected to be @ @@ -112,21 +110,16 @@ #################### # exported to spec files as plrelease -PLANETLAB_RELEASE = 5.0 +PLANETLAB_RELEASE = 5.2 # # Default values # -# minimal compat with macos, just so this does not complain +# 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 -YUM-INSTALL-DEVEL := yum -y install #################### Makefile # Default target @@ -137,15 +130,15 @@ all: PLDISTRO := planetlab RPMBUILD := rpmbuild -########## savedpldistro.mk holds PLDISTRO - it is generated at stage1 (see below) +########## envfrompreviousrun.mk holds PLDISTRO and others - it is generated at stage1 (see below) ifeq "$(stage1)" "" -include savedpldistro.mk +include envfrompreviousrun.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 +include envfrompreviousrun.mk endif #################### include onelab.mk @@ -161,16 +154,11 @@ endif include $(PLDISTROTAGS) # this used to be set in the -tags.mk files, but that turned out to require -# error-prone duplicate changes +# error-prone duplicate changes # so now the nightly build script sets this to what it is currently using -# in case we run this manually, i.e. if neither build-SVNPATH nor build-GITPATH is set -ifeq "$(build-SVNPATH)$(build-GITPATH)" "" -build-GITPATH-local := $(shell git config remote.origin.url) -ifneq "$(build-GITPATH-local)" "" -build-GITPATH := $(build-GITPATH-local) -else -build-SVNPATH := $(lastword $(shell svn info 2> /dev/null | grep URL:)) -endif +# in case we run this manually, i.e. if build-GITPATH is not set +ifeq "$(build-GITPATH)" "" +build-GITPATH := $(shell git config remote.origin.url) endif #################### pldistros that are defined remotely @@ -182,7 +170,6 @@ config.$(1): config.$(1).svnpath svn export $$($(1).config.SVNPATH) config.$(1) endef -FOO=@ # fetching with git define remote_pldistro_fetch_git $(1).config.GITPATH := $(shell grep -v "^#" config.$(1).gitpath) @@ -215,12 +202,13 @@ $(eval $(call remote_pldistro_fetch_$(3),$(1))) endef $(eval $(call remote_pldistro,wextoolbox,wextoolbox-tags,git)) +$(eval $(call remote_pldistro,wexlxc,wexlxc-tags,git)) ########## stage1 and stage1iter -# extract specs and compute .mk files by running +# extract specs and compute .mk files by running # make stage1=true # entering stage1, we compute all the spec files -# then we use stage1iter 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 stage1iter is set, it is supposed to be an index (starting at 1) in $(ALL) @@ -265,7 +253,7 @@ include $(ALLMKS) #all : modules #all : rpms #all : srpms -# mention $(ALL) here rather than rpms +# mention $(ALL) here rather than rpms # this is because the inter-package dependencies are expressed like # util-vserver: util-python all: rpms @@ -274,11 +262,11 @@ endif endif ### yumgroups.xml : compute from all known .pkgs files -RPMS/yumgroups.xml: +RPMS/yumgroups.xml: mkdir -p RPMS ./yumgroups.sh $(PLDISTRO) > $@ -createrepo = createrepo --quiet -g yumgroups.xml RPMS/ +createrepo = createrepo --quiet -g yumgroups.xml RPMS/ repo: RPMS/yumgroups.xml $(createrepo) @@ -286,7 +274,7 @@ repo: RPMS/yumgroups.xml .PHONY: repo #################### -# notes: +# notes: # * we always use the first module's location (SVNPATH/GITPATH) to extract the spec file # * no matter what SCM is used, SPEC should hold a relative path from the module's root # @@ -322,13 +310,13 @@ endef $(foreach module,$(ALL.modules), $(eval $(call stage1_module_vars,$(module)))) # -# for each package, compute whether we need to set date +# 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' -# (*) or GITPATH has no '@' (trunk) +# (*) or SVNPATH contains 'trunk' or 'branches' +# (*) or GITPATH has no '@' (trunk) # (*) or GITPATH contains a '@', and the gittag part has no '-' (this is to tell a tag from a branch..) -# +# define package_hasdate $(1).has-date = $(if $($(1)-RPMDATE),yes, \ $(if $($($(1).module)-SVNPATH), \ @@ -342,8 +330,17 @@ $(foreach package, $(ALL), $(eval $(call package_hasdate,$(package)))) ### the common header for generated specfiles # useful when trying new specfiles manually +### +# note for fedora23 (and onwards, probably) +# many rpms wouldn't build as-is and issue an weird error +## +# Processing files: pl_sshd-debuginfo-1.0-11.lxc.x86_64 +# error: Empty %files file /longbuildroot/BUILD/pl_sshd-1.0/debugfiles.list +## +# so to work around that we define debug_package as being nil +# only for f23 for now, let's see what this gives us.. header.spec: - (echo -n "# Generated by planetlab build from $($(1)-SPEC) on " ; date) > $@ + (echo -n "# Generated by planetlab build on " ; date) > $@ echo "%define distro $(DISTRO)" >> $@ echo "%define distrorelease $(RELEASE)" >> $@ echo "%define distroname $(DISTRONAME)" >> $@ @@ -354,6 +351,9 @@ header.spec: echo "%global _source_filedigest_algorithm 1" >> $@ echo "%global _source_payload w9.gzdio" >> $@ echo "%global _binary_payload w9.gzdio" >> $@ +ifeq "$(DISTRONAME)""$(filter $(DISTRONAME),f25 f27 f29)" + echo "%define debug_package %{nil}" >> $@ +endif ### make up spec file - extract module first define target_spec @@ -374,16 +374,40 @@ endef $(foreach package,$(ALL),$(eval $(call target_spec,$(package)))) +#################### +# fetch modules +# expected input: +# $(1) is the name of a git module +# $($(1).gitrepo) and $(($1).gittag) are used to determine branch or tag name +# expected result +# $(1)/ in the cwd will hold the result + +# fetch svn module +define fetch_svn_module + svn export $($(1)-SVNPATH) $(1) +endef + +# git_fetch_module +# as far as possible we use git-archive to fetch a git module +# however if that fails we fallback to a git-clone strategy, +# for when git-archive is not supported, e.g. for github +# side effect +# $(1)/ gets cleaned up if job cannot be done +define fetch_git_module + mkdir $(1) ; \ + (git archive --remote=$($(1).gitrepo) $($(1).gittag) | tar -C $(1) -xf - ) || \ + (echo "==================== git archive FAILED, trying git clone instead" ; \ + git clone $($(1).gitrepo) $(1); cd $(1) ; git checkout $($(1).gittag) ; rm -rf .git ) || \ + { rm -rf $(1); false; } +endef + ### module extraction define target_extract_module MODULES/$(1): @(echo -n "XXXXXXXXXXXXXXX -- BEG MODULE $(1) : $@ " ; date) mkdir -p MODULES cd MODULES && \ - $(if $($(1)-SVNPATH),\ - svn export $($(1)-SVNPATH) $(1),\ - mkdir $(1) ; (git archive --remote=$($(1).gitrepo) $($(1).gittag) | tar -C $(1) -xf - ) \ - || { rm -rf $(1); false; } ) + $(if $($(1)-SVNPATH),$(call fetch_svn_module,$(1)),$(call fetch_git_module,$(1)) ) @(echo -n "XXXXXXXXXXXXXXX -- END MODULE $(1) : $@ " ; date) $(1)-module: MODULES/$(1) @@ -393,7 +417,10 @@ endef $(foreach module,$(ALL.modules),$(eval $(call target_extract_module,$(module)))) ### the tests area -# use this makefile to extract tests rather than extracting manually in vbuild-nightly +build-clean: + rm -rf MODULES/build +.PHONY: build-clean + tests-clean: rm -rf MODULES/tests .PHONY: tests-clean @@ -411,11 +438,15 @@ export HOME := $(FAKEROOT) else export HOME := $(PWD) endif + +# rpm macros +# build.common (getrpmmacros.sh) defines some utilities we want in place on our images +# in addition to these we set a few others for the build .rpmmacros: ifeq "$(shell pwd)" "/build" rm -f $(FAKEROOT) ; ln -s $(REALROOT) $(FAKEROOT) endif - rm -f $@ + rm -f $@ echo "%_topdir $(HOME)" >> $@ echo "%_tmppath $(HOME)/tmp" >> $@ echo "%__spec_install_pre %{___build_pre}" >> $@ @@ -423,8 +454,9 @@ endif ### this utility allows to extract various info from a spec file ### and to define them in makefiles +# use the C code where it works as it's the original one, use the python code otherwise spec2make: spec2make.c - $(CC) -g -Wall $< -o $@ -lrpm -lrpmbuild -lrpmio -lpopt + $(CC) -g -Wall $< -o $@ -lrpm -lrpmbuild -lrpmio -lpopt || ln -s spec2make.py $@ ### run spec2make on the spec file and include the result # usage: spec2make package @@ -438,10 +470,16 @@ endef $(foreach package,$(ALL),$(eval $(call target_mk,$(package)))) -# stores PLDISTRO in a file -# this is done at stage1. later run wont get confused -SAVED_VARS=PLDISTRO PLDISTROTAGS build-SVNPATH PERSONALITY MAILTO BASE WEBPATH TESTBUILDURL WEBROOT -savedpldistro.mk: +# stores env variables in a file +# this is done at stage1. later run won't get confused +STATIC_VARS=PLDISTRO PLDISTROTAGS build-GITPATH PERSONALITY MAILTO BASE WEBPATH TESTBUILDURL WEBROOT +# find out names for variables set on the command line +define assigned_varname +$(if $(findstring =,$(1)),$(firstword $(subst =, ,$(1))) ) +endef +ASSIGNED=$(filter-out stage1 stage1iter,$(foreach flag,$(MAKEFLAGS),$(call assigned_varname,$(flag)))) +SAVED_VARS=$(sort $(STATIC_VARS) $(ASSIGNED)) +envfrompreviousrun.mk: @echo "# do not edit" > $@ @$(foreach var,$(SAVED_VARS),echo "$(var):=$($(var))" >> $@ ;) @echo "# do not edit" > aliases @@ -450,24 +488,24 @@ savedpldistro.mk: @echo "\"" >> aliases @echo "alias m1=\"m stage1=true\"" >> aliases -savedpldistro: savedpldistro.mk -.PHONY: savedpldistro +envfrompreviousrun: envfrompreviousrun.mk +.PHONY: envfrompreviousrun # always refresh this -all: savedpldistro +all: envfrompreviousrun #################### regular make define stage2_variables ### devel dependencies $(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) +$(1).all-local-devel-rpm-paths := $(foreach rpm,$($(1)-LOCAL-DEVEL-RPMS) $($(1)-LOCAL-DEVEL-RPMS-CRUCIAL),$($(rpm).rpm-path)) +$(1).depend-devel-packages := $(sort $(foreach rpm,$($(1)-LOCAL-DEVEL-RPMS),$($(rpm).package))) +ALL-STOCK-DEVEL-RPMS += $($(1)-LOCAL-DEVEL-RPMS) endef $(foreach package,$(ALL),$(eval $(call stage2_variables,$(package)))) -ALL-DEVEL-RPMS := $(sort $(ALL-DEVEL-RPMS)) +ALL-STOCK-DEVEL-RPMS := $(sort $(ALL-STOCK-DEVEL-RPMS)) ### pack sources into tarballs @@ -488,13 +526,13 @@ SOURCES/%.tgz: SOURCES/% ## URLS/%: url=$(subst @colon@,:,$(subst @slash@,/,$(notdir $@))) URLS/%: basename=$(notdir $(url)) -URLS/%: +URLS/%: echo curl $(url) -o SOURCES/$(basename) touch $@ -### the directory SOURCES/- is made +### the directory SOURCES/- is made # with a (set of) copy -rl from MODULES/ -# the former is $(package.source) +# the former is $(package.source) ALLSOURCES:=$(foreach package, $(ALL), $($(package).source)) # so that make does not use the rule below directly for creating the tarball files .SECONDARY: $(ALLSOURCES) @@ -527,45 +565,70 @@ srpms: $(ALLSRPMS) @echo $(words $(ALLSRPMS)) source rpms OK .PHONY: srpms +#################### manage build requirements +# default values +RPMYUM-INSTALL-LOCAL := rpm --force -Uvh +RPMYUM-INSTALL-STOCK := yum -y install +# uninstall -- cannot force rpm -e +# need to ignore result, kernel-headers cannot be uninstalled as glibc depends on it +RPMYUM-UNINSTALL-STOCK := rpm -e + +### these macro handles the LOCAL-DEVEL-RPMS and LOCAL-DEVEL-RPMS-CRUCIAL tags for a given package +# before building : rpm-install LOCAL-DEVEL-RPMS +define rpmyum_install_local_rpms + $(if $($(1).all-local-devel-rpm-paths), echo "Installing for $(1)-LOCAL-DEVEL-RPMS" ; $(RPMYUM-INSTALL-LOCAL) $($(1).all-local-devel-rpm-paths)) +endef + +# install stock rpms if defined +define rpmyum_install_stock_rpms + $(if $($(1)-STOCK-DEVEL-RPMS), echo "Installing for $(1)-STOCK-DEVEL-RPMS" ; $(RPMYUM-INSTALL-STOCK) $($(1)-STOCK-DEVEL-RPMS) || true) +endef + +define rpmyum_uninstall_stock_rpms + -$(if $($(1)-STOCK-DEVEL-RPMS), echo "Unstalling for $(1)-STOCK-DEVEL-RPMS" ; $(RPMYUM-UNINSTALL-STOCK) $($(1)-STOCK-DEVEL-RPMS) || true) +endef + +# similar for debians +# gdebi acts like yum localinstall; gdebi-core should be mentioned in develdeb.pkgs +DPKGAPT-INSTALL-LOCAL := gdebi +DPKGAPT-INSTALL-STOCK := apt-get -y install +DPKGAPT-UNINSTALL-STOCK := echo WARNING uninstalling stock debs not implemented -# install the DEVEL-RPMS rpms if defined -define handle_stock_devel_rpms_pre - $(if $($(1)-DEVEL-RPMS), echo "Installing for $(1)-DEVEL-RPMS" ; $(YUM-INSTALL-DEVEL) $($(1)-DEVEL-RPMS)) +define dpkgapt_install_local_debs + $(if $($(1)-LOCAL-DEVEL-DEBS), echo "Installing for $(1)-LOCAL-DEVEL-DEBS" ; $(foreach debname,$($(1)-LOCAL-DEVEL-DEBS),$(DPKGAPT-INSTALL-LOCAL) $(wildcard DEBIAN/$(debname)_*.deb);)) endef -### these macro handles the DEPEND-DEVEL-RPMS and EXCLUDE-DEVEL-RPMS tags for a hiven package -# before building : rpm-install DEPEND-DEVEL-RPMS and rpm-uninstall EXCLUDE -define handle_local_devel_rpms_pre - $(if $($(1).all-devel-rpm-paths), echo "Installing for $(1)-DEPEND-DEVEL-RPMS" ; $(RPM-INSTALL-DEVEL) $($(1).all-devel-rpm-paths)) - $(if $($(1)-EXCLUDE-DEVEL-RPMS), echo "Uninstalling for $(1)-EXCLUDE-DEVEL-RPMS" ; $(RPM-UNINSTALL-DEVEL) $($(1)-EXCLUDE-DEVEL-RPMS)) +define dpkgapt_install_stock_debs + $(if $($(1)-STOCK-DEVEL-DEBS), echo "Installing for $(1)-STOCK-DEVEL-DEBS" ; $(DPKGAPT-INSTALL-STOCK) $($(1)-STOCK-DEVEL-DEBS) || true) endef -define handle_local_devel_rpms_post - -$(if $($(1)-DEPEND-DEVEL-RPMS), echo "Unstalling for $(1)-DEPEND-DEVEL-RPMS" ; $(RPM-UNINSTALL-DEVEL) $($(1)-DEPEND-DEVEL-RPMS)) - $(if $($(1)-EXCLUDE-DEVEL-RPMS), "Reinstalling for $(1)-EXCLUDE-DEVEL-RPMS" ; $(YUM-INSTALL-DEVEL) $($(1)-EXCLUDE-DEVEL-RPMS) ) +define dpkgapt_uninstall_stock_debs + -$(if $($(1)-STOCK-DEVEL-DEBS), echo "Unstalling for $(1)-STOCK-DEVEL-DEBS" ; $(DPKGAPT-UNINSTALL-STOCK) $($(1)-STOCK-DEVEL-DEBS) || true) endef + +#################### # usage: target_source_rpm package -define target_source_rpm +define target_source_rpm ifeq "$($(1)-BUILD-FROM-SRPM)" "" -$($(1).srpm): $($(1).specpath) .rpmmacros $($(1).tarballs) +$($(1).srpm): $($(1).specpath) .rpmmacros $($(1).tarballs) mkdir -p BUILD SRPMS tmp @(echo -n "XXXXXXXXXXXXXXX -- BEG SRPM $(1) (using SOURCES) " ; date) - $(call handle_stock_devel_rpms_pre,$(1)) - $(call handle_local_devel_rpms_pre,$(1)) + $(call rpmyum_install_stock_rpms,$(1)) + $(call rpmyum_install_local_rpms,$(1)) $($(1).rpmbuild) -bs $($(1).specpath) - $(call handle_local_devel_rpms_post,$(1)) + $(call rpmyum_uninstall_stock_rpms,$(1)) @(echo -n "XXXXXXXXXXXXXXX -- END SRPM $(1) " ; date) else $($(1).srpm): $($(1).specpath) .rpmmacros $($(1).source) mkdir -p BUILD SRPMS tmp @(echo -n "XXXXXXXXXXXXXXX -- BEG SRPM $(1) (using make srpm) " ; date) - $(call handle_stock_devel_rpms_pre,$(1)) - $(call handle_local_devel_rpms_pre,$(1)) + $(call rpmyum_install_stock_rpms,$(1)) + $(call rpmyum_install_local_rpms,$(1)) make -C $($(1).source) srpm SPECFILE=$(HOME)/$($(1).specpath) EXPECTED_SRPM=$(notdir $($(1).srpm)) && \ rm -f SRPMS/$(notdir $($(1).srpm)) && \ - ln $($(1).source)/$(notdir $($(1).srpm)) SRPMS/$(notdir $($(1).srpm)) - $(call handle_local_devel_rpms_post,$(1)) + ln $($(1).source)/$(notdir $($(1).srpm)) SRPMS/$(notdir $($(1).srpm)) + $(call rpmyum_uninstall_stock_rpms,$(1)) @(echo -n "XXXXXXXXXXXXXXX -- END SRPM $(1) " ; date) endif endef @@ -579,32 +642,32 @@ rpms: $(ALLRPMS) @echo $(words $(ALLRPMS)) binary rpms OK .PHONY: rpms -# use tmp dirs when building binary rpm so make remains idempotent +# 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 +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) , ) - $(call handle_stock_devel_rpms_pre,$(1)) - $(call handle_local_devel_rpms_pre,$(1)) + $(call rpmyum_install_stock_rpms,$(1)) + $(call rpmyum_install_local_rpms,$(1)) $($(1).rpmbuild) --rebuild $(RPM-USE-TMP-DIRS) $($(1).srpm) - $(call handle_local_devel_rpms_post,$(1)) + $(call rpmyum_uninstall_stock_rpms,$(1)) @(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) , ) - $(call handle_stock_devel_rpms_pre,$(1)) - $(call handle_local_devel_rpms_pre,$(1)) + $(call rpmyum_install_stock_rpms,$(1)) + $(call rpmyum_install_local_rpms,$(1)) $($(1).rpmbuild) --recompile $(RPM-USE-TMP-DIRS) $($(1).srpm) - $(call handle_local_devel_rpms_post,$(1)) + $(call rpmyum_uninstall_stock_rpms,$(1)) @(echo -n "XXXXXXXXXXXXXXX -- END compile $(1) " ; date) .PHONY: $(1)-compile endef @@ -613,7 +676,7 @@ $(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 +define target_shorthand $(1): $($(1).rpms) .PHONY: $(1) $(1)-spec: $($(1)-SPEC) @@ -657,6 +720,30 @@ endef $(foreach package,$(ALL),$(eval $(call target_depends,$(package)))) +#################### +# debian meta-target +ALL-DEBIAN := $(foreach target,$(ALL),$(target)-debian) +debian: $(ALL-DEBIAN) + +#################### +# very rough for now (one module per package), targets only sfa for now +# the general idea here is, changing the specfile (for version number and all) is enough, and this +# gets passed to "make debian" in the module +# PREFIX: at one point we had passed PREFIX=/usr to this 'make debian' +# however it turned out we could manage this some other way (see manifold) +# so I'm reverting to simplicity +define target_debian +$(1)-debian: $(1)-tarball + $(call dpkgapt_install_local_debs,$(1)) + $(call dpkgapt_install_stock_debs,$(1)) + mkdir -p DEBIAN/$(1) + rsync -a MODULES/$($(1).module)/ DEBIAN/$(1)/ + make -C DEBIAN/$(1) "RPMTARBALL=$(HOME)/$($(1).tarballs)" "RPMVERSION=$($(1).rpm-version)" "RPMRELEASE=$($(1).rpm-release)" "RPMNAME=$($(1).rpm-name)" debian + $(call dpkgapt_uninstall_stock_debs,$(1)) +endef + +$(foreach package,$(ALL),$(eval $(call target_debian,$(package)))) + ### clean target # usage: target_clean package define target_clean @@ -683,9 +770,13 @@ $(1)-clean-srpm: rm -rf $($(1).srpm) .PHONY: $(1)-clean-srpm CLEANS += $(1)-clean-srpm -$(1)-codeclean: $(1)-clean-source $(1)-clean-tarball $(1)-clean-build $(1)-clean-rpms $(1)-clean-srpm +$(1)-clean-debian: + rm -rf DEBIAN/$(1) +.PHONY: $(1)-clean-srpm +CLEANS += $(1)-clean-srpm +$(1)-codeclean: $(1)-clean-source $(1)-clean-tarball $(1)-clean-build $(1)-clean-rpms $(1)-clean-srpm $(1)-clean-debian $(1)-clean: $(1)-clean-modules $(1)-codeclean -.PHONY: $(1)-codeclean $(1)-clean +.PHONY: $(1)-codeclean $(1)-clean $(1)-clean-spec: rm -rf $($(1).specpath) .PHONY: $(1)-clean-spec @@ -711,14 +802,14 @@ clean-help: ### brute force clean distclean1: - rm -rf savedpldistro.mk .rpmmacros spec2make header.spec SPECS MAKE $(DISTCLEANS) + rm -rf envfrompreviousrun.mk .rpmmacros spec2make header.spec SPECS MAKE $(DISTCLEANS) distclean2: - rm -rf MODULES SOURCES BUILD BUILDROOT RPMS SRPMS tmp + rm -rf MODULES SOURCES BUILD BUILDROOT RPMS SRPMS DEBIAN tmp distclean: distclean1 distclean2 .PHONY: distclean1 distclean2 distclean develclean: - -$(RPM-UNINSTALL-DEVEL) $(ALL-DEVEL-RPMS) + -$(RPMYUM-UNINSTALL-STOCK) $(ALL-STOCK-DEVEL-RPMS) #################### # gather build information for the 'About' page @@ -746,10 +837,10 @@ version-build: @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)" + @echo "Build target-release: $(RELEASE)" + @echo "Build target-personality: $(PERSONALITY)" -#################### +#################### # for a given module VFORMAT="%30s := %s\n" define print_tag_target @@ -778,12 +869,12 @@ versions: myplc-release version-build version-tags version-rpms #################### package info PKGKEYS := tarballs source srpm rpms rpmnames rpm-release rpm-name rpm-version rpm-subversion %-pkginfo: package=$(subst -pkginfo,,$@) -%-pkginfo: +%-pkginfo: @$(foreach key,$(PKGKEYS),echo "$(package).$(key)=$($(package).$(key))";) ## rpm info RPMKEYS := rpm-path package %-rpminfo: rpm=$(subst -rpminfo,,$@) -%-rpminfo: +%-rpminfo: @$(foreach key,$(RPMKEYS),echo "$(rpm).$(key)=$($(rpm).$(key))";) #################### various lists - designed to run with stage1=true @@ -808,7 +899,7 @@ module-tools: echo $(module):$($(module)-BRANCH); , \ echo $(module); ))) -info: info-packages info-modules info-branches +info: info-packages info-modules info-branches .PHONY: info info-packages info-modules info-branches module-tools