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  build/Makefile                                     |  1 +
  12  ...ce-dpkg-checkbuilddeps-with-mk-build-deps.patch | 38 ++++++++++++++++++++++
  13  2 files changed, 39 insertions(+)
  14  create mode 100644 build/replace-dpkg-checkbuilddeps-with-mk-build-deps.patch
  15
  16 diff --git a/build/Makefile b/build/Makefile
  17 index d917f26..ec5d27a 100644
  18 --- a/build/Makefile
  19 +++ b/build/Makefile
  20 @@ -140,6 +140,7 @@ $(ISOCACHE):
  21         cd /tmp/fuel-main && git am $(TOPDIR)/bootstrap_admin_node.sh.patch
  22         cd /tmp/fuel-main && git am $(TOPDIR)/isolinux.cfg.patch
  23         cd /tmp/fuel-main && git am $(TOPDIR)/repo-multi-arch-local-mirrors.patch
  24 +       cd /tmp/fuel-main && git am $(TOPDIR)/replace-dpkg-checkbuilddeps-with-mk-build-deps.patch
  25         # Repeat build up to three times
  26         sudo -E ./fuel_build_loop
  27         cp /tmp/fuel-main/build/artifacts/fuel*.iso .
  28 diff --git a/build/replace-dpkg-checkbuilddeps-with-mk-build-deps.patch b/build/replace-dpkg-checkbuilddeps-with-mk-build-deps.patch
  29 new file mode 100644
  30 index 0000000..896f3cf
  31 --- /dev/null
  32 +++ b/build/replace-dpkg-checkbuilddeps-with-mk-build-deps.patch
  33 @@ -0,0 +1,38 @@
  34 +From: Sergii Golovatiuk <sgolovatiuk@mirantis.com>
  35 +Date: Fri, 3 Jun 2016 12:26:19 +0200
  36 +Subject: [PATCH] Replace dpkg-checkbuilddeps with mk-build-deps
  37 +
  38 +dpkg-checkbuilddeps doesn't check dependencies inside chroot as in many
  39 +cases host system might not have required packages. This change replaces
  40 +dpkg-checkbuilddeps with mk-build-deps in chroot
  41 +
  42 +Implements: mos-xenial
  43 +Change-Id: I27a65893c1bd33e6d82c11bf3d08423562dbe4d2
  44 +Signed-off-by: Sergii Golovatiuk <sgolovatiuk@mirantis.com>
  45 +---
  46 + packages/deb/module.mk | 5 ++---
  47 + 1 file changed, 2 insertions(+), 3 deletions(-)
  48 +
  49 +diff --git a/packages/deb/module.mk b/packages/deb/module.mk
  50 +index 6c93441..c0ba737 100644
  51 +--- a/packages/deb/module.mk
  52 ++++ b/packages/deb/module.mk
  53 +@@ -10,7 +10,7 @@ clean-deb:
  54 +       done
  55 +       sudo rm -rf $(BUILD_DIR)/packages/deb
  56 +
  57 +-$(BUILD_DIR)/packages/deb/buildd.tar.gz: SANDBOX_DEB_PKGS:=wget bzip2 apt-utils build-essential python-setuptools python-pbr devscripts debhelper fakeroot
  58 ++$(BUILD_DIR)/packages/deb/buildd.tar.gz: SANDBOX_DEB_PKGS:=wget bzip2 apt-utils build-essential fakeroot devscripts equivs debhelper python-setuptools python-pbr
  59 + $(BUILD_DIR)/packages/deb/buildd.tar.gz: SANDBOX_UBUNTU:=$(BUILD_DIR)/packages/deb/chroot
  60 + $(BUILD_DIR)/packages/deb/buildd.tar.gz: export SANDBOX_UBUNTU_UP:=$(SANDBOX_UBUNTU_UP)
  61 + $(BUILD_DIR)/packages/deb/buildd.tar.gz: export SANDBOX_UBUNTU_DOWN:=$(SANDBOX_UBUNTU_DOWN)
  62 +@@ -47,8 +47,7 @@ $(BUILD_DIR)/packages/deb/$1.done: $(BUILD_DIR)/repos/repos.done
  63 +               sudo -E dch -c $$(SANDBOX_UBUNTU)/tmp/$1/debian/changelog -D $(UBUNTU_RELEASE) -b --force-distribution \
  64 +               -v $(PACKAGE_VERSION)-`awk -F'=' '/DEBRELEASE/ {print $$$$2}' $(BUILD_DIR)/packages/sources/$1/version` \
  65 +               "`awk -F'=' '/DEBMSG/ {print $$$$2}' $(BUILD_DIR)/packages/sources/$1/version`"
  66 +-      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
  67 +-      sudo chroot $$(SANDBOX_UBUNTU) /bin/sh -c "cat /tmp/$1.installdeps | xargs --no-run-if-empty apt-get -y install"
  68 ++      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"
  69 +       sudo chroot $$(SANDBOX_UBUNTU) /bin/sh -c "cd /tmp/$1 ; DEB_BUILD_OPTIONS=nocheck debuild -us -uc -b -d"
  70 +       cp $$(SANDBOX_UBUNTU)/tmp/*.deb $(BUILD_DIR)/packages/deb/packages
  71 +       sudo sh -c "$$$${SANDBOX_UBUNTU_DOWN}"