From: Stanislaw Kardach Date: Thu, 25 Feb 2016 13:31:19 +0100 Subject: [PATCH] repo mirror: Allow multi-arch local 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). Signed-off-by: Stanislaw Kardach Signed-off-by: Alexandru Avadanii --- config.mk | 2 +- mirror/ubuntu/module.mk | 2 +- sandbox.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config.mk b/config.mk index e0b988b..593f105 100644 --- a/config.mk +++ b/config.mk @@ -48,7 +48,7 @@ UBUNTU_MINOR?=04 UBUNTU_RELEASE_NUMBER:=$(UBUNTU_MAJOR).$(UBUNTU_MINOR) UBUNTU_KERNEL_FLAVOR?=lts-xenial UBUNTU_NETBOOT_FLAVOR?=netboot -UBUNTU_ARCH:=amd64 +UBUNTU_ARCH?=amd64 UBUNTU_IMAGE_RELEASE:=$(UBUNTU_MAJOR)$(UBUNTU_MINOR) SEPARATE_IMAGES?=/boot,ext2 /,ext4 diff --git a/mirror/ubuntu/module.mk b/mirror/ubuntu/module.mk index 5b4d762..b4fa99c 100644 --- a/mirror/ubuntu/module.mk +++ b/mirror/ubuntu/module.mk @@ -33,7 +33,7 @@ set -ex; ./debmirror --progress --checksums --nocleanup \ --root=$(MIRROR_MOS_UBUNTU_ROOT) \ --dist=$(MIRROR_MOS_UBUNTU_SUITE)$1 \ --section=$(subst $(space),$(comma),$(MIRROR_MOS_UBUNTU_SECTION)) \ - --arch=$(UBUNTU_ARCH) \ + --arch=$(shell echo $(UBUNTU_ARCH) | tr ' ' ',') \ $(LOCAL_MIRROR_UBUNTU)/ endef diff --git a/sandbox.mk b/sandbox.mk index 9d34dc9..e787f43 100644 --- a/sandbox.mk +++ b/sandbox.mk @@ -199,7 +199,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 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) +sudo 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