# (*) 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
# 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.<distro>/devel.pkgs or config.planetlab/devel.pkgs as appropriate
-# (*) package-DEPEND-DEVEL-RPMS
-# a set of
local *rpms* that the build will rpm-install before building <package>
+# (*) package-LOCAL-DEVEL-RPMS
+# a set of
*local* rpms that the build will rpm-install before building <package>
# 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
-# (*) package-DEPEND-DEVEL-RPMS-UPDATES
-# like package-DEPEND-DEVEL-RPMS but for crucial packages (like autoconf) that only need an update from our build
+# 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
####################
# exported to spec files as plrelease
-PLANETLAB_RELEASE = 5.1
+PLANETLAB_RELEASE = 5.2
#
# Default values
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
$(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)
$(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
$(foreach package,$(ALL),$(eval $(call target_mk,$(package))))
# stores env variables in a file
-# this is done at stage1. later run wont get confused
-SAVED_VARS=PLDISTRO PLDISTROTAGS build-GITPATH PERSONALITY MAILTO BASE WEBPATH TESTBUILDURL WEBROOT
-# also remember variable settings in alias, like sfa-GITPATH=git://git.f-lab.fr/sfa.git@generic
-# but don't save stage1
-ASSIGNS=$(foreach chunk,$(MAKEFLAGS),$(if $(findstring =,$(chunk)),$(if $(findstring stage1,$(chunk)),,$(chunk)),))
+# 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))" >> $@ ;)
- @$(foreach chunk,$(ASSIGNS),echo "override $(chunk)" | sed -e s,=,:=, >> $@;)
@echo "# do not edit" > aliases
@echo -n "alias m=\"make " >> aliases
@$(foreach var,$(SAVED_VARS),echo -n " $(var)=$($(var))" >> aliases ;)
- @echo -n $(ASSIGNS) >> aliases
@echo "\"" >> aliases
@echo "alias m1=\"m stage1=true\"" >> aliases
define stage2_variables
### devel dependencies
$(1).rpmbuild = $(RPMBUILD) $($(1)-RPMFLAGS)
-$(1).all-devel-rpm-paths := $(foreach rpm,$($(1)-DEPEND-DEVEL-RPMS) $($(1)-DEPEND-DEVEL-RPMS-UPDATES),$($(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
@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
-# 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))
+### 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
-### these macro handles the DEPEND-DEVEL-RPMS and DEPEND-DEVEL-RPMS-UPDATES tags for a given package
-# before building : rpm-install DEPEND-DEVEL-RPMS
-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))
+# 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))
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))
+define rpmyum_uninstall_stock_rpms
+ -$(if $($(1)-STOCK-DEVEL-RPMS), echo "Unstalling for $(1)-STOCK-DEVEL-RPMS" ; $(RPMYUM-UNINSTALL-STOCK) $($(1)-STOCK-DEVEL-RPMS))
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
+
+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
+
+define dpkgapt_install_stock_debs
+ $(if $($(1)-STOCK-DEVEL-DEBS), echo "Installing for $(1)-STOCK-DEVEL-DEBS" ; $(DPKGAPT-INSTALL-STOCK) $($(1)-STOCK-DEVEL-DEBS))
+endef
+
+define dpkgapt_uninstall_stock_debs
+ -$(if $($(1)-STOCK-DEVEL-DEBS), echo "Unstalling for $(1)-STOCK-DEVEL-DEBS" ; $(DPKGAPT-UNINSTALL-STOCK) $($(1)-STOCK-DEVEL-DEBS))
+endef
+
+
+####################
# usage: target_source_rpm package
define target_source_rpm
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)
- $(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))
+ $(call rpmyum_uninstall_stock_rpms,$(1))
@(echo -n "XXXXXXXXXXXXXXX -- END SRPM $(1) " ; date)
endif
endef
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
$(foreach package,$(ALL),$(eval $(call target_depends,$(package))))
####################
-# very rough for now (one module per package), targets only sfa
+# 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)-debian: $(1)-tarball
+ $(call dpkgapt_install_local_debs,$(1))
+ $(call dpkgapt_install_stock_debs,$(1))
mkdir -p DEBIAN/$(1)
- rsync -av MODULES/$(1)/ DEBIAN/$(1)/
- make -C DEBIAN/$(1) debian
+ 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))))
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
$(1)-clean-spec:
distclean1:
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
git://git.onelab.eu / build.git / blobdiff