Browse Source

Revert "Make sure the ISO tracks the latest merged code"

This reverts commit c6bf2265d2.

Change-Id: Id41834a48af813aeabea223da5981cb454cef75c
Vladimir Kozhukalov 2 years ago
parent
commit
5fd55ab813
2 changed files with 12 additions and 37 deletions
  1. 0
    13
      00-debmirror.patch
  2. 12
    24
      mirror/ubuntu/module.mk

+ 0
- 13
00-debmirror.patch View File

@@ -1,13 +0,0 @@
1
-diff --git a/debmirror b/debmirror
2
-index 0c2543c..f2fdd61 100755
3
---- a/debmirror
4
-+++ b/debmirror
5
-@@ -2116,7 +2116,7 @@ sub name_release {
6
- 
7
-   if ($origin eq "none") {
8
-     $codename = $dist_raw;
9
--  } elsif ($origin eq "Ubuntu" or $origin eq "Canonical") {
10
-+  } elsif ($origin eq "Ubuntu" or $origin eq "Canonical" or $origin eq "Mirantis") {
11
-     if ($suite) {
12
-       say("Ubuntu Release file: using Suite ($suite).");
13
-       $codename = $suite;

+ 12
- 24
mirror/ubuntu/module.mk View File

@@ -24,18 +24,7 @@ Architectures: $(UBUNTU_ARCH)
24 24
 VerifyRelease: blindtrust
25 25
 endef
26 26
 
27
-define do_debmirror
28
-set -ex; ./debmirror --progress --checksums --nocleanup \
29
-  --nosource --ignore-release-gpg --rsync-extra=none \
30
-  --exclude-deb-section='^debug$$' \
31
-  --method=$(MIRROR_MOS_UBUNTU_METHOD) \
32
-  --host=$(MIRROR_MOS_UBUNTU) \
33
-  --root=$(MIRROR_MOS_UBUNTU_ROOT) \
34
-  --dist=$(MIRROR_MOS_UBUNTU_SUITE)$1 \
35
-  --section=$(subst $(space),$(comma),$(MIRROR_MOS_UBUNTU_SECTION)) \
36
-  --arch=$(UBUNTU_ARCH) \
37
-  $(LOCAL_MIRROR_UBUNTU)/
38
-endef
27
+
39 28
 
40 29
 # Two operation modes:
41 30
 # USE_MIRROR=none - mirroring mode, rsync full mirror from internal build server
@@ -58,18 +47,12 @@ $(reprepro_updates_conf)
58 47
 EOF
59 48
 endef
60 49
 
61
-
62 50
 $(BUILD_DIR)/mirror/ubuntu/reprepro_config.done: export config_reprepro:=$(config_reprepro)
63 51
 $(BUILD_DIR)/mirror/ubuntu/reprepro_config.done:
64 52
 	mkdir -p $(REPREPRO_CONF_DIR)
65 53
 	sh -c "$${config_reprepro}"
66 54
 	$(ACTION.TOUCH)
67 55
 
68
-$(BUILD_DIR)/mirror/ubuntu/prepare_debmirror.done:
69
-	cp /usr/bin/debmirror .
70
-	patch -p1 ./debmirror < ./00-debmirror.patch
71
-	$(ACTION.TOUCH)
72
-
73 56
 $(BUILD_DIR)/mirror/ubuntu/reprepro.done: \
74 57
 		$(BUILD_DIR)/mirror/ubuntu/mirror.done \
75 58
 		$(BUILD_DIR)/mirror/ubuntu/reprepro_config.done
@@ -88,12 +71,17 @@ $(BUILD_DIR)/mirror/ubuntu/repo.done: \
88 71
 	rm -rf $(LOCAL_MIRROR_UBUNTU)/lists
89 72
 	$(ACTION.TOUCH)
90 73
 
91
-$(BUILD_DIR)/mirror/ubuntu/mirror.done: \
92
-		$(BUILD_DIR)/mirror/ubuntu/prepare_debmirror.done
74
+$(BUILD_DIR)/mirror/ubuntu/mirror.done:
93 75
 	mkdir -p $(LOCAL_MIRROR_UBUNTU)
94
-	$(call do_debmirror)
95
-	$(call do_debmirror,-proposed)
96
-	$(call do_debmirror,-updates)
97
-	$(call do_debmirror,-security)
76
+	set -ex; debmirror --progress --checksums --nocleanup \
77
+	--nosource --ignore-release-gpg --rsync-extra=none \
78
+	--exclude-deb-section='^debug$$' \
79
+	--method=$(MIRROR_MOS_UBUNTU_METHOD) \
80
+	--host=$(MIRROR_MOS_UBUNTU) \
81
+	--root=$(MIRROR_MOS_UBUNTU_ROOT) \
82
+	--dist=$(MIRROR_MOS_UBUNTU_SUITE) \
83
+	--section=$(subst $(space),$(comma),$(MIRROR_MOS_UBUNTU_SECTION)) \
84
+	--arch=$(UBUNTU_ARCH) \
85
+	$(LOCAL_MIRROR_UBUNTU)/
98 86
 	rm -rf $(LOCAL_MIRROR_UBUNTU)/.temp $(LOCAL_MIRROR_UBUNTU)/project
99 87
 	$(ACTION.TOUCH)

Loading…
Cancel
Save