diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-06-17 23:31:30 +0200 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-06-17 23:39:13 +0200 |
commit | c3cc95ae45b39786a18a84b3ea1029140f492ee6 (patch) | |
tree | a61fca988088f5fc2926ca27d0e16cc8bd91b412 /patches/fuel-main/0001-Use-qemu-debootstrap-to-support-multi-arch.patch | |
parent | ed8f923065efc8251ca8faaf878f7c98c6cec6a1 (diff) |
f-m: Remove qemu-user-static.
Previously, we added and used qemu-user-static and its wrapper
over debootstrap (qemu-debootstrap) in:
- requirements-rpm.txt
No longer needed, qemu-user-static should be added automatically
as a cobbler rpm dependency (similar to cobbler-grub-aarch64);
- prepare-build-env.sh
No longer needed, we only support building packages natively.
We never built an arm64 chroot at ISO build time.
- sandbox.mk
Same motivation as above, no longer needed.
I think this would have needed qemu-user-static on build machine,
and binfmt properly set up on that machine as well, adding
complexity to the build process, although we do not use it.
So, simplify things a little and prepare this for upstream.
Change-Id: Idfce5aa594f1fcd92b1f238c7d07cb88f26064b8
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/fuel-main/0001-Use-qemu-debootstrap-to-support-multi-arch.patch')
-rw-r--r-- | patches/fuel-main/0001-Use-qemu-debootstrap-to-support-multi-arch.patch | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/patches/fuel-main/0001-Use-qemu-debootstrap-to-support-multi-arch.patch b/patches/fuel-main/0001-Use-qemu-debootstrap-to-support-multi-arch.patch deleted file mode 100644 index 07f1fb93..00000000 --- a/patches/fuel-main/0001-Use-qemu-debootstrap-to-support-multi-arch.patch +++ /dev/null @@ -1,50 +0,0 @@ -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,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 |