aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-02-15 03:13:57 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-02-15 03:15:38 +0100
commit8a9019372a77f42648603db42a196fee0755d77e (patch)
tree7758db022747997819d2396138d1ad1514243f3c
parent5fda43edc9289ccde040d6bfe42e85bf88c77f1b (diff)
patch: fuel-main: Adjust context to match upstream
Change-Id: I532567f0d48ceb84eb1e3afedcd9b555eab51ac9 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r--build/f_repos/patch/fuel-main/0003-repo-mirror-Allow-multi-arch-local-mirrors.patch18
1 files changed, 9 insertions, 9 deletions
diff --git a/build/f_repos/patch/fuel-main/0003-repo-mirror-Allow-multi-arch-local-mirrors.patch b/build/f_repos/patch/fuel-main/0003-repo-mirror-Allow-multi-arch-local-mirrors.patch
index a31c52b95..b90fd1951 100644
--- a/build/f_repos/patch/fuel-main/0003-repo-mirror-Allow-multi-arch-local-mirrors.patch
+++ b/build/f_repos/patch/fuel-main/0003-repo-mirror-Allow-multi-arch-local-mirrors.patch
@@ -35,15 +35,15 @@ 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)
+@@ -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