summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergii Golovatiuk <sgolovatiuk@mirantis.com>2016-06-03 12:26:19 +0200
committerSergii Golovatiuk <sgolovatiuk@mirantis.com>2016-06-03 19:26:16 +0200
commit73d3fbc98c39da950bf295f5e7e50dcf44083202 (patch)
tree8479d0fc89bac2698bb6a69a06330f334240d4b7
parent0486ff752f3df4edce8f2be425cd64e8ae0e6024 (diff)
Replace dpkg-checkbuilddeps with mk-build-deps
dpkg-checkbuilddeps doesn't check dependencies inside chroot as in many cases host system might not have required packages. This change replaces dpkg-checkbuilddeps with mk-build-deps in chroot Implements: mos-xenial Change-Id: I27a65893c1bd33e6d82c11bf3d08423562dbe4d2 Signed-off-by: Sergii Golovatiuk <sgolovatiuk@mirantis.com>
Notes
Notes (review): Code-Review+1: Dmitry Burmistrov <dmburmistrov@mirantis.com> Code-Review+1: Maksim Malchuk <mmalchuk@mirantis.com> Code-Review+2: Vladimir Kozhukalov <vkozhukalov@mirantis.com> Workflow+1: Sergii Golovatiuk <sgolovatiuk@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Mon, 06 Jun 2016 13:26:58 +0000 Reviewed-on: https://review.openstack.org/325210 Project: openstack/fuel-main Branch: refs/heads/master
-rw-r--r--packages/deb/module.mk5
1 files changed, 2 insertions, 3 deletions
diff --git a/packages/deb/module.mk b/packages/deb/module.mk
index 6c93441..c0ba737 100644
--- a/packages/deb/module.mk
+++ b/packages/deb/module.mk
@@ -10,7 +10,7 @@ clean-deb:
10 done 10 done
11 sudo rm -rf $(BUILD_DIR)/packages/deb 11 sudo rm -rf $(BUILD_DIR)/packages/deb
12 12
13$(BUILD_DIR)/packages/deb/buildd.tar.gz: SANDBOX_DEB_PKGS:=wget bzip2 apt-utils build-essential python-setuptools python-pbr devscripts debhelper fakeroot 13$(BUILD_DIR)/packages/deb/buildd.tar.gz: SANDBOX_DEB_PKGS:=wget bzip2 apt-utils build-essential fakeroot devscripts equivs debhelper python-setuptools python-pbr
14$(BUILD_DIR)/packages/deb/buildd.tar.gz: SANDBOX_UBUNTU:=$(BUILD_DIR)/packages/deb/chroot 14$(BUILD_DIR)/packages/deb/buildd.tar.gz: SANDBOX_UBUNTU:=$(BUILD_DIR)/packages/deb/chroot
15$(BUILD_DIR)/packages/deb/buildd.tar.gz: export SANDBOX_UBUNTU_UP:=$(SANDBOX_UBUNTU_UP) 15$(BUILD_DIR)/packages/deb/buildd.tar.gz: export SANDBOX_UBUNTU_UP:=$(SANDBOX_UBUNTU_UP)
16$(BUILD_DIR)/packages/deb/buildd.tar.gz: export SANDBOX_UBUNTU_DOWN:=$(SANDBOX_UBUNTU_DOWN) 16$(BUILD_DIR)/packages/deb/buildd.tar.gz: export SANDBOX_UBUNTU_DOWN:=$(SANDBOX_UBUNTU_DOWN)
@@ -47,8 +47,7 @@ $(BUILD_DIR)/packages/deb/$1.done: $(BUILD_DIR)/repos/repos.done
47 sudo -E dch -c $$(SANDBOX_UBUNTU)/tmp/$1/debian/changelog -D $(UBUNTU_RELEASE) -b --force-distribution \ 47 sudo -E dch -c $$(SANDBOX_UBUNTU)/tmp/$1/debian/changelog -D $(UBUNTU_RELEASE) -b --force-distribution \
48 -v $(PACKAGE_VERSION)-`awk -F'=' '/DEBRELEASE/ {print $$$$2}' $(BUILD_DIR)/packages/sources/$1/version` \ 48 -v $(PACKAGE_VERSION)-`awk -F'=' '/DEBRELEASE/ {print $$$$2}' $(BUILD_DIR)/packages/sources/$1/version` \
49 "`awk -F'=' '/DEBMSG/ {print $$$$2}' $(BUILD_DIR)/packages/sources/$1/version`" 49 "`awk -F'=' '/DEBMSG/ {print $$$$2}' $(BUILD_DIR)/packages/sources/$1/version`"
50 dpkg-checkbuilddeps $(BUILD_DIR)/repos/$1/debian/control 2>&1 | sed 's/^dpkg-checkbuilddeps: Unmet build dependencies: //g' | sed 's/([^()]*)//g;s/|//g' | sudo tee $$(SANDBOX_UBUNTU)/tmp/$1.installdeps 50 sudo chroot $$(SANDBOX_UBUNTU) /bin/sh -c "mk-build-deps --install --remove --tool 'apt-get --yes --no-remove --no-install-recommends' /tmp/$1/debian/control"
51 sudo chroot $$(SANDBOX_UBUNTU) /bin/sh -c "cat /tmp/$1.installdeps | xargs --no-run-if-empty env LC_ALL=C DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get -y install"
52 sudo chroot $$(SANDBOX_UBUNTU) /bin/sh -c "cd /tmp/$1 ; DEB_BUILD_OPTIONS=nocheck debuild -us -uc -b -d" 51 sudo chroot $$(SANDBOX_UBUNTU) /bin/sh -c "cd /tmp/$1 ; DEB_BUILD_OPTIONS=nocheck debuild -us -uc -b -d"
53 cp $$(SANDBOX_UBUNTU)/tmp/*.deb $(BUILD_DIR)/packages/deb/packages 52 cp $$(SANDBOX_UBUNTU)/tmp/*.deb $(BUILD_DIR)/packages/deb/packages
54 sudo sh -c "$$$${SANDBOX_UBUNTU_DOWN}" 53 sudo sh -c "$$$${SANDBOX_UBUNTU_DOWN}"