From 5fd55ab81364d29283b92aa1f336a6722b07c340 Mon Sep 17 00:00:00 2001
From: Vladimir Kozhukalov <vkozhukalov@mirantis.com>
Date: Fri, 9 Sep 2016 11:37:18 +0000
Subject: [PATCH] Revert "Make sure the ISO tracks the latest merged code"

This reverts commit c6bf2265d28edeb723d154230b1da48207b0f938.

Change-Id: Id41834a48af813aeabea223da5981cb454cef75c
---
 00-debmirror.patch      | 13 -------------
 mirror/ubuntu/module.mk | 36 ++++++++++++------------------------
 2 files changed, 12 insertions(+), 37 deletions(-)
 delete mode 100644 00-debmirror.patch

diff --git a/00-debmirror.patch b/00-debmirror.patch
deleted file mode 100644
index 46302cbfc..000000000
--- a/00-debmirror.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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 ddceb2da3..7a9466eeb 100644
--- a/mirror/ubuntu/module.mk
+++ b/mirror/ubuntu/module.mk
@@ -24,18 +24,7 @@ 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
@@ -58,18 +47,12 @@ $(reprepro_updates_conf)
 EOF
 endef
 
-
 $(BUILD_DIR)/mirror/ubuntu/reprepro_config.done: export config_reprepro:=$(config_reprepro)
 $(BUILD_DIR)/mirror/ubuntu/reprepro_config.done:
 	mkdir -p $(REPREPRO_CONF_DIR)
 	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
@@ -88,12 +71,17 @@ $(BUILD_DIR)/mirror/ubuntu/repo.done: \
 	rm -rf $(LOCAL_MIRROR_UBUNTU)/lists
 	$(ACTION.TOUCH)
 
-$(BUILD_DIR)/mirror/ubuntu/mirror.done: \
-		$(BUILD_DIR)/mirror/ubuntu/prepare_debmirror.done
+$(BUILD_DIR)/mirror/ubuntu/mirror.done:
 	mkdir -p $(LOCAL_MIRROR_UBUNTU)
-	$(call do_debmirror)
-	$(call do_debmirror,-proposed)
-	$(call do_debmirror,-updates)
-	$(call do_debmirror,-security)
+	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)/
 	rm -rf $(LOCAL_MIRROR_UBUNTU)/.temp $(LOCAL_MIRROR_UBUNTU)/project
 	$(ACTION.TOUCH)