diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-06-18 19:47:44 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-06-28 12:57:27 +0000 |
| commit | 293e752ad5f422359c8d0efa0a51fbb484318212 (patch) | |
| tree | 0ac5f51af589c07f7cb2d44a658c772d11d0f327 /patches/fuel-main/0001-mirror-sandbox-Allow-multi-arch-debian-mirrors.patch | |
| parent | 1c049bf03ddff1c0b5d4f89a954bf5effe665b59 (diff) | |
Rework: Drop fuel-main submodule.
Move fuel-main patching to opnfv-fuel, preparing for upstreaming
this to Fuel@OPNFV.
Drop fuel-main submodule!
Change-Id: I12b995f37701658dca1d1a212ede029d0e03231c
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/fuel-main/0001-mirror-sandbox-Allow-multi-arch-debian-mirrors.patch')
| -rw-r--r-- | patches/fuel-main/0001-mirror-sandbox-Allow-multi-arch-debian-mirrors.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/patches/fuel-main/0001-mirror-sandbox-Allow-multi-arch-debian-mirrors.patch b/patches/fuel-main/0001-mirror-sandbox-Allow-multi-arch-debian-mirrors.patch deleted file mode 100644 index 18f2c20e..00000000 --- a/patches/fuel-main/0001-mirror-sandbox-Allow-multi-arch-debian-mirrors.patch +++ /dev/null @@ -1,44 +0,0 @@ -From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com> -Date: Thu, 25 Feb 2016 13:31:19 +0100 -Subject: [PATCH] mirror, sandbox: 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). - -Signed-off-by: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com> ---- - 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 4bc3962..5ffddbd 100644 ---- a/sandbox.mk -+++ b/sandbox.mk -@@ -188,7 +188,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 |