From: Stanislaw Kardach 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,6 +112,7 @@ lrzip \ python-jinja2 \ python-yaml \ + qemu-user-static reprepro \ rpm \ syslinux \ unzip \ 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