patches/opnfv-fuel/0040-Backport-dpkg-checkbuilddeps-to-mk-build-deps.patch

   1 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
   2 Date: Wed, 6 Jul 2016 17:03:49 +0200
   3 Subject: [PATCH] Backport: dpkg-checkbuilddeps to mk-build-deps.
   4
   5 Backported from [1].
   6
   7 [1] https://review.openstack.org/#/c/325210/
   8
   9 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  10 ---
  11  ...ce-dpkg-checkbuilddeps-with-mk-build-deps.patch | 38 ++++++++++++++++++++++
  12  1 files changed, 38 insertions(+)
  13  create mode 100644 build/replace-dpkg-checkbuilddeps-with-mk-build-deps.patch
  14
  15 diff --git a/build/patch-repos/0040-replace-dpkg-checkbuilddeps-with-mk-build-deps.patch b/build/patch-repos/0040-replace-dpkg-checkbuilddeps-with-mk-build-deps.patch
  16 new file mode 100644
  17 index 0000000..896f3cf
  18 --- /dev/null
  19 +++ b/build/patch-repos/0040-replace-dpkg-checkbuilddeps-with-mk-build-deps.patch
  20 @@ -0,0 +1,38 @@
  21 +From: Sergii Golovatiuk <sgolovatiuk@mirantis.com>
  22 +Date: Fri, 3 Jun 2016 12:26:19 +0200
  23 +Subject: [PATCH] Replace dpkg-checkbuilddeps with mk-build-deps
  24 +
  25 +dpkg-checkbuilddeps doesn't check dependencies inside chroot as in many
  26 +cases host system might not have required packages. This change replaces
  27 +dpkg-checkbuilddeps with mk-build-deps in chroot
  28 +
  29 +Implements: mos-xenial
  30 +Change-Id: I27a65893c1bd33e6d82c11bf3d08423562dbe4d2
  31 +Signed-off-by: Sergii Golovatiuk <sgolovatiuk@mirantis.com>
  32 +---
  33 + packages/deb/module.mk | 5 ++---
  34 + 1 file changed, 2 insertions(+), 3 deletions(-)
  35 +
  36 +diff --git a/packages/deb/module.mk b/packages/deb/module.mk
  37 +index 6c93441..c0ba737 100644
  38 +--- a/packages/deb/module.mk
  39 ++++ b/packages/deb/module.mk
  40 +@@ -10,7 +10,7 @@ clean-deb:
  41 +       done
  42 +       sudo rm -rf $(BUILD_DIR)/packages/deb
  43 +
  44 +-$(BUILD_DIR)/packages/deb/buildd.tar.gz: SANDBOX_DEB_PKGS:=wget bzip2 apt-utils build-essential python-setuptools python-pbr devscripts debhelper fakeroot
  45 ++$(BUILD_DIR)/packages/deb/buildd.tar.gz: SANDBOX_DEB_PKGS:=wget bzip2 apt-utils build-essential fakeroot devscripts equivs debhelper python-setuptools python-pbr
  46 + $(BUILD_DIR)/packages/deb/buildd.tar.gz: SANDBOX_UBUNTU:=$(BUILD_DIR)/packages/deb/chroot
  47 + $(BUILD_DIR)/packages/deb/buildd.tar.gz: export SANDBOX_UBUNTU_UP:=$(SANDBOX_UBUNTU_UP)
  48 + $(BUILD_DIR)/packages/deb/buildd.tar.gz: export SANDBOX_UBUNTU_DOWN:=$(SANDBOX_UBUNTU_DOWN)
  49 +@@ -47,8 +47,7 @@ $(BUILD_DIR)/packages/deb/$1.done: $(BUILD_DIR)/repos/repos.done
  50 +               sudo -E dch -c $$(SANDBOX_UBUNTU)/tmp/$1/debian/changelog -D $(UBUNTU_RELEASE) -b --force-distribution \
  51 +               -v $(PACKAGE_VERSION)-`awk -F'=' '/DEBRELEASE/ {print $$$$2}' $(BUILD_DIR)/packages/sources/$1/version` \
  52 +               "`awk -F'=' '/DEBMSG/ {print $$$$2}' $(BUILD_DIR)/packages/sources/$1/version`"
  53 +-      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
  54 +-      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"
  55 ++      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"
  56 +       sudo chroot $$(SANDBOX_UBUNTU) /bin/sh -c "cd /tmp/$1 ; DEB_BUILD_OPTIONS=nocheck debuild -us -uc -b -d"
  57 +       cp $$(SANDBOX_UBUNTU)/tmp/*.deb $(BUILD_DIR)/packages/deb/packages
  58 +       sudo sh -c "$$$${SANDBOX_UBUNTU_DOWN}"