From 38e1b3fbaab1ff3661c12094c1dfb769b9255300 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat <thierry.parmentelat@inria.fr> Date: Mon, 23 Sep 2013 13:07:26 +0200 Subject: [PATCH] debian : support for stock devel packages required for building (-STOCK-DEVEL-DEBS) --- Makefile | 15 +++++++++++++++ lxc.mk | 1 + onelab.mk | 1 + 3 files changed, 17 insertions(+) diff --git a/Makefile b/Makefile index d453f80e..ab1e4d43 100644 --- a/Makefile +++ b/Makefile @@ -548,6 +548,19 @@ define rpmyum_uninstall_stock_rpms -$(if $($(1)-LOCAL-DEVEL-RPMS), echo "Unstalling for $(1)-LOCAL-DEVEL-RPMS" ; $(RPMYUM-UNINSTALL-STOCK) $($(1)-LOCAL-DEVEL-RPMS)) endef +# similar for debian +DPKGAPT-INSTALL-STOCK := apt-get -y install +DPKGAPT-UNINSTALL-STOCK := echo WARNING uninstalling stock debs not implemented + +define dpkgapt_install_stock_rpms + $(if $($(1)-STOCK-DEVEL-DEBS), echo "Installing for $(1)-STOCK-DEVEL-DEBS" ; $(DPKGAPT-INSTALL-STOCK) $($(1)-STOCK-DEVEL-DEBS)) +endef + +define dpkgapt_uninstall_stock_rpms + -$(if $($(1)-LOCAL-DEVEL-DEBS), echo "Unstalling for $(1)-LOCAL-DEVEL-DEBS" ; $(DPKGAPT-UNINSTALL-STOCK) $($(1)-LOCAL-DEVEL-DEBS)) +endef + + #################### # usage: target_source_rpm package define target_source_rpm @@ -670,9 +683,11 @@ $(foreach package,$(ALL),$(eval $(call target_depends,$(package)))) # so I'm reverting to simplicity define target_debian $(1)-debian: $(1)-tarball + $(dpkgapt-install-stock $(1)) mkdir -p DEBIAN/$(1) rsync -a MODULES/$(1)/ DEBIAN/$(1)/ make -C DEBIAN/$(1) "RPMTARBALL=$(HOME)/$($(1).tarballs)" "RPMVERSION=$($(1).rpm-version)" "RPMRELEASE=$($(1).rpm-release)" "RPMNAME=$($(1).rpm-name)" debian + $(dpkgapt-uninstall-stock $(1)) endef $(foreach package,$(ALL),$(eval $(call target_debian,$(package)))) diff --git a/lxc.mk b/lxc.mk index d21b9b52..cb046e14 100644 --- a/lxc.mk +++ b/lxc.mk @@ -537,6 +537,7 @@ endif myslice-MODULES := myslice myslice-SPEC := myslice.spec myslice-STOCK-DEVEL-RPMS := python-django +myslice-STOCK-DEVEL-DEBS := python-django #ALL += myslice manifold-MODULES := manifold diff --git a/onelab.mk b/onelab.mk index 23abb0b1..d0f5d3f1 100644 --- a/onelab.mk +++ b/onelab.mk @@ -593,6 +593,7 @@ endif myslice-MODULES := myslice myslice-SPEC := myslice.spec myslice-STOCK-DEVEL-RPMS := python-django +myslice-STOCK-DEVEL-DEBS := python-django #ALL += myslice manifold-MODULES := manifold -- 2.47.0