patch: fuel-main: Adjust context to match upstream 61/28661/1
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Wed, 15 Feb 2017 02:13:57 +0000 (03:13 +0100)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Wed, 15 Feb 2017 02:15:38 +0000 (03:15 +0100)
Change-Id: I532567f0d48ceb84eb1e3afedcd9b555eab51ac9
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
build/f_repos/patch/fuel-main/0003-repo-mirror-Allow-multi-arch-local-mirrors.patch

index a31c52b..b90fd19 100644 (file)
@@ -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