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/0002-Allow-multi-arch-debian-mirrors.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/0002-Allow-multi-arch-debian-mirrors.patch')
| -rw-r--r-- | patches/fuel-main/0002-Allow-multi-arch-debian-mirrors.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/patches/fuel-main/0002-Allow-multi-arch-debian-mirrors.patch b/patches/fuel-main/0002-Allow-multi-arch-debian-mirrors.patch deleted file mode 100644 index 9be98494..00000000 --- a/patches/fuel-main/0002-Allow-multi-arch-debian-mirrors.patch +++ /dev/null @@ -1,42 +0,0 @@ -From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com> -Date: Thu, 25 Feb 2016 23:58:58 +0100 -Subject: [PATCH] Allow multi-arch debian mirrors - -This patch allows specifying multiple architectures via UBUNTU_ARCH in -form of a list of space separated architectures. The first architecture -in the list is considered primary and will be used for building all the -deb packages by fuel-main. Additional architectures are added to allow -targets of other architectures to use the mirror. -NOTE: this imposes a requirement that all packages built are arch -independent (which is true so far). ---- - mirror/ubuntu/module.mk | 2 +- - sandbox.mk | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/mirror/ubuntu/module.mk b/mirror/ubuntu/module.mk -index 7a9466e..fe1ada2 100644 ---- a/mirror/ubuntu/module.mk -+++ b/mirror/ubuntu/module.mk -@@ -81,7 +81,7 @@ $(BUILD_DIR)/mirror/ubuntu/mirror.done: - --root=$(MIRROR_MOS_UBUNTU_ROOT) \ - --dist=$(MIRROR_MOS_UBUNTU_SUITE) \ - --section=$(subst $(space),$(comma),$(MIRROR_MOS_UBUNTU_SECTION)) \ -- --arch=$(UBUNTU_ARCH) \ -+ --arch=$(shell echo $(UBUNTU_ARCH) | tr ' ' ',') \ - $(LOCAL_MIRROR_UBUNTU)/ - rm -rf $(LOCAL_MIRROR_UBUNTU)/.temp $(LOCAL_MIRROR_UBUNTU)/project - $(ACTION.TOUCH) -diff --git a/sandbox.mk b/sandbox.mk -index cf3704b..18757a1 100644 ---- a/sandbox.mk -+++ b/sandbox.mk -@@ -183,7 +183,7 @@ 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 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) -+sudo qemu-debootstrap --no-check-gpg --include=ca-certificates --arch=$(word 1,$(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 |