From 52701ce099ac455aa393aac34d684f5d59b3d2fe Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 27 Aug 2016 17:13:32 +0200 Subject: build: Move patches to dir Decouple main Makefile and repository patches by moving all Fuel component patches to a subdir, . Proposed structure of dir: - patch-repos/*.patch are intended for git repo; - patch-repos/build/repo//*.patch are intended for , e.g. "fuel-nailgun"; Full list of Fuel submodules supported by this mechanism at [1]. While at it, replace all occurences of with in main Makefile and rewrite a few git/make calls to use the "-C" arg. NOTE: `git -C` is available starting with git 1.8.5. [1] https://github.com/openstack/fuel-main/blob/stable/mitaka/repos.mk #L32-L44 Change-Id: I5e4adc7285054777c3898592ed48482ccd2b706f Signed-off-by: Alexandru Avadanii --- build/repo-multi-arch-local-mirrors.patch | 59 ------------------------------- 1 file changed, 59 deletions(-) delete mode 100644 build/repo-multi-arch-local-mirrors.patch (limited to 'build/repo-multi-arch-local-mirrors.patch') diff --git a/build/repo-multi-arch-local-mirrors.patch b/build/repo-multi-arch-local-mirrors.patch deleted file mode 100644 index d40428743..000000000 --- a/build/repo-multi-arch-local-mirrors.patch +++ /dev/null @@ -1,59 +0,0 @@ -From: Stanislaw Kardach -Date: Thu, 25 Feb 2016 13:31:19 +0100 -Subject: 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 ---- - mirror/ubuntu/module.mk | 2 +- - sandbox.mk | 2 +- - config.mk | 2 +- - 3 files changed, 3 insertions(+), 3 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 -diff --git a/config.mk b/config.mk -index 74ee039..45a3b30 100644 ---- a/config.mk -+++ b/config.mk -@@ -49,7 +49,7 @@ UBUNTU_MINOR:=04 - UBUNTU_RELEASE_NUMBER:=$(UBUNTU_MAJOR).$(UBUNTU_MINOR) - UBUNTU_KERNEL_FLAVOR?=lts-trusty - UBUNTU_NETBOOT_FLAVOR?=netboot --UBUNTU_ARCH:=amd64 -+UBUNTU_ARCH?=amd64 - UBUNTU_IMAGE_RELEASE:=$(UBUNTU_MAJOR)$(UBUNTU_MINOR) - SEPARATE_IMAGES?=/boot,ext2 /,ext4 - -- cgit 1.2.3-korg