From 10f5d75a4a356c2700b7b6fa8f378b0d13581145 Mon Sep 17 00:00:00 2001
From: Valeriy Sakharov <vsakharov@mirantis.com>
Date: Wed, 21 Sep 2016 11:41:23 +0300
Subject: [PATCH] Make sure the ISO tracks the latest merged code

After MOS 9.0 release main repositories are now freezed, and the latest
merged code lands into -proposed. Thus to keep development and CI for
stable/mitaka branch packages from proposed should be added to the ISO.

Change-Id: I5f63ec2921e96e7efbb383eb4a92a40e2ab900bd
Closes-bug: #1619309
(cherry picked from commit 7c45cbe6133004873510985b48cb967de3263e95)
---
 00-debmirror.patch      | 13 +++++++++++++
 mirror/ubuntu/module.mk | 35 +++++++++++++++++++++++------------
 2 files changed, 36 insertions(+), 12 deletions(-)
 create mode 100644 00-debmirror.patch

diff --git a/00-debmirror.patch b/00-debmirror.patch
new file mode 100644
index 000000000..46302cbfc
--- /dev/null
+++ b/00-debmirror.patch
@@ -0,0 +1,13 @@
+diff --git a/debmirror b/debmirror
+index 0c2543c..f2fdd61 100755
+--- a/debmirror
++++ b/debmirror
+@@ -2116,7 +2116,7 @@ sub name_release {
+ 
+   if ($origin eq "none") {
+     $codename = $dist_raw;
+-  } elsif ($origin eq "Ubuntu" or $origin eq "Canonical") {
++  } elsif ($origin eq "Ubuntu" or $origin eq "Canonical" or $origin eq "Mirantis") {
+     if ($suite) {
+       say("Ubuntu Release file: using Suite ($suite).");
+       $codename = $suite;
diff --git a/mirror/ubuntu/module.mk b/mirror/ubuntu/module.mk
index 7a9466eeb..5f0dccea1 100644
--- a/mirror/ubuntu/module.mk
+++ b/mirror/ubuntu/module.mk
@@ -24,7 +24,18 @@ Architectures: $(UBUNTU_ARCH)
 VerifyRelease: blindtrust
 endef
 
-
+define do_debmirror
+set -ex; ./debmirror --progress --checksums --nocleanup \
+  --nosource --ignore-release-gpg --rsync-extra=none \
+  --exclude-deb-section='^debug$$' \
+  --method=$(MIRROR_MOS_UBUNTU_METHOD) \
+  --host=$(MIRROR_MOS_UBUNTU) \
+  --root=$(MIRROR_MOS_UBUNTU_ROOT) \
+  --dist=$(MIRROR_MOS_UBUNTU_SUITE)$1 \
+  --section=$(subst $(space),$(comma),$(MIRROR_MOS_UBUNTU_SECTION)) \
+  --arch=$(UBUNTU_ARCH) \
+  $(LOCAL_MIRROR_UBUNTU)/
+endef
 
 # Two operation modes:
 # USE_MIRROR=none - mirroring mode, rsync full mirror from internal build server
@@ -53,6 +64,11 @@ $(BUILD_DIR)/mirror/ubuntu/reprepro_config.done:
 	sh -c "$${config_reprepro}"
 	$(ACTION.TOUCH)
 
+$(BUILD_DIR)/mirror/ubuntu/prepare_debmirror.done:
+	cp /usr/bin/debmirror .
+	patch -p1 ./debmirror < ./00-debmirror.patch
+	$(ACTION.TOUCH)
+
 $(BUILD_DIR)/mirror/ubuntu/reprepro.done: \
 		$(BUILD_DIR)/mirror/ubuntu/mirror.done \
 		$(BUILD_DIR)/mirror/ubuntu/reprepro_config.done
@@ -71,17 +87,12 @@ $(BUILD_DIR)/mirror/ubuntu/repo.done: \
 	rm -rf $(LOCAL_MIRROR_UBUNTU)/lists
 	$(ACTION.TOUCH)
 
-$(BUILD_DIR)/mirror/ubuntu/mirror.done:
+$(BUILD_DIR)/mirror/ubuntu/mirror.done: \
+		$(BUILD_DIR)/mirror/ubuntu/prepare_debmirror.done
 	mkdir -p $(LOCAL_MIRROR_UBUNTU)
-	set -ex; debmirror --progress --checksums --nocleanup \
-	--nosource --ignore-release-gpg --rsync-extra=none \
-	--exclude-deb-section='^debug$$' \
-	--method=$(MIRROR_MOS_UBUNTU_METHOD) \
-	--host=$(MIRROR_MOS_UBUNTU) \
-	--root=$(MIRROR_MOS_UBUNTU_ROOT) \
-	--dist=$(MIRROR_MOS_UBUNTU_SUITE) \
-	--section=$(subst $(space),$(comma),$(MIRROR_MOS_UBUNTU_SECTION)) \
-	--arch=$(UBUNTU_ARCH) \
-	$(LOCAL_MIRROR_UBUNTU)/
+	$(call do_debmirror)
+	-$(call do_debmirror,-proposed)
+	-$(call do_debmirror,-updates)
+	-$(call do_debmirror,-security)
 	rm -rf $(LOCAL_MIRROR_UBUNTU)/.temp $(LOCAL_MIRROR_UBUNTU)/project
 	$(ACTION.TOUCH)