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
6 prepare-build-env.sh | 2 +-
7 requirements-rpm.txt | 1 +
9 3 files changed, 4 insertions(+), 3 deletions(-)
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,7 +112,7 @@ sudo apt-get -y install build-essential make git $GEMPKG debootstrap createrepo
16 python-nose libvirt-bin python-ipaddr python-paramiko python-yaml \
17 python-pip kpartx extlinux unzip genisoimage syslinux debmirror \
18 lrzip python-daemon python-dev libparse-debcontrol-perl reprepro devscripts \
20 + xorriso qemu-user-static
21 sudo gem install bundler -v 1.2.1
22 sudo gem install builder
23 sudo pip install xmlbuilder jinja2 pbr
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
36 diff --git a/sandbox.mk b/sandbox.mk
37 index 3c65cc6..cf3704b 100644
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