patches/fuel-main/0001-Use-qemu-debootstrap-to-support-multi-arch.patch

   1 From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
   2 Date: Thu, 25 Feb 2016 13:31:19 +0100
   3 Subject: [PATCH] Use qemu-debootstrap to support multi-arch
   4
   5 ---
   6  prepare-build-env.sh | 2 +-
   7  requirements-rpm.txt | 1 +
   8  sandbox.mk           | 4 ++--
   9  3 files changed, 4 insertions(+), 3 deletions(-)
  10
  11 diff --git a/prepare-build-env.sh b/prepare-build-env.sh
  12 index 194e528..fa186ed 100755
  13 --- a/prepare-build-env.sh
  14 +++ b/prepare-build-env.sh
  15 @@ -112,6 +112,7 @@
  16    lrzip \
  17    python-jinja2 \
  18    python-yaml \
  19 +  qemu-user-static
  20    reprepro \
  21    rpm \
  22    syslinux \
  23    unzip \
  24 diff --git a/requirements-rpm.txt b/requirements-rpm.txt
  25 index e0aa9ba..9a2d141 100644
  26 --- a/requirements-rpm.txt
  27 +++ b/requirements-rpm.txt
  28 @@ -202,6 +202,7 @@ python-yaql
  29  pytz
  30  PyYAML
  31  qemu-img
  32 +qemu-user-static
  33  rabbitmq-server
  34  rpm
  35  rpm-build
  36 diff --git a/sandbox.mk b/sandbox.mk
  37 index 3c65cc6..cf3704b 100644
  38 --- a/sandbox.mk
  39 +++ b/sandbox.mk
  40 @@ -182,8 +182,8 @@ mkdir -p $(SANDBOX_UBUNTU)/etc/init.d
  41  touch $(SANDBOX_UBUNTU)/etc/init.d/.legacy-bootordering
  42  mkdir -p $(SANDBOX_UBUNTU)/usr/sbin
  43  cp -a $(BUILD_DIR)/policy-rc.d $(SANDBOX_UBUNTU)/usr/sbin
  44 -echo "Running debootstrap"
  45 -sudo debootstrap --no-check-gpg --include=ca-certificates --arch=$(UBUNTU_ARCH) $(MIRROR_UBUNTU_SUITE) $(SANDBOX_UBUNTU) $(MIRROR_UBUNTU_METHOD)://$(MIRROR_UBUNTU)$(MIRROR_UBUNTU_ROOT)
  46 +echo "Running qemu-debootstrap"
  47 +sudo qemu-debootstrap --no-check-gpg --include=ca-certificates --arch=$(UBUNTU_ARCH) $(MIRROR_UBUNTU_SUITE) $(SANDBOX_UBUNTU) $(MIRROR_UBUNTU_METHOD)://$(MIRROR_UBUNTU)$(MIRROR_UBUNTU_ROOT)
  48  if [ -e $(SANDBOX_UBUNTU)/etc/resolv.conf ]; then sudo cp -a $(SANDBOX_UBUNTU)/etc/resolv.conf $(SANDBOX_UBUNTU)/etc/resolv.conf.orig; fi
  49  sudo cp /etc/resolv.conf $(SANDBOX_UBUNTU)/etc/resolv.conf
  50  if [ -e $(SANDBOX_UBUNTU)/etc/hosts ]; then sudo cp -a $(SANDBOX_UBUNTU)/etc/hosts $(SANDBOX_UBUNTU)/etc/hosts.orig; fi