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