Browse Source

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.

Closes-bug: #1619309

Change-Id: I8f7cd2fd221e3db5893f7a369696b13f29f83bd5
Dmitry Teselkin 2 years ago
parent
commit
c6bf2265d2
2 changed files with 37 additions and 12 deletions
  1. 13
    0
      00-debmirror.patch
  2. 24
    12
      mirror/ubuntu/module.mk

+ 13
- 0
00-debmirror.patch View File

@@ -0,0 +1,13 @@
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;

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

@@ -24,7 +24,18 @@ Architectures: $(UBUNTU_ARCH)
24 24
 VerifyRelease: blindtrust
25 25
 endef
26 26
 
27
-
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
28 39
 
29 40
 # Two operation modes:
30 41
 # USE_MIRROR=none - mirroring mode, rsync full mirror from internal build server
@@ -47,12 +58,18 @@ $(reprepro_updates_conf)
47 58
 EOF
48 59
 endef
49 60
 
61
+
50 62
 $(BUILD_DIR)/mirror/ubuntu/reprepro_config.done: export config_reprepro:=$(config_reprepro)
51 63
 $(BUILD_DIR)/mirror/ubuntu/reprepro_config.done:
52 64
 	mkdir -p $(REPREPRO_CONF_DIR)
53 65
 	sh -c "$${config_reprepro}"
54 66
 	$(ACTION.TOUCH)
55 67
 
68
+$(BUILD_DIR)/mirror/ubuntu/prepare_debmirror.done:
69
+	cp /usr/bin/debmirror .
70
+	patch -p1 ./debmirror < ./00-debmirror.patch
71
+	$(ACTION.TOUCH)
72
+
56 73
 $(BUILD_DIR)/mirror/ubuntu/reprepro.done: \
57 74
 		$(BUILD_DIR)/mirror/ubuntu/mirror.done \
58 75
 		$(BUILD_DIR)/mirror/ubuntu/reprepro_config.done
@@ -71,17 +88,12 @@ $(BUILD_DIR)/mirror/ubuntu/repo.done: \
71 88
 	rm -rf $(LOCAL_MIRROR_UBUNTU)/lists
72 89
 	$(ACTION.TOUCH)
73 90
 
74
-$(BUILD_DIR)/mirror/ubuntu/mirror.done:
91
+$(BUILD_DIR)/mirror/ubuntu/mirror.done: \
92
+		$(BUILD_DIR)/mirror/ubuntu/prepare_debmirror.done
75 93
 	mkdir -p $(LOCAL_MIRROR_UBUNTU)
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)/
94
+	$(call do_debmirror)
95
+	$(call do_debmirror,-proposed)
96
+	$(call do_debmirror,-updates)
97
+	$(call do_debmirror,-security)
86 98
 	rm -rf $(LOCAL_MIRROR_UBUNTU)/.temp $(LOCAL_MIRROR_UBUNTU)/project
87 99
 	$(ACTION.TOUCH)

Loading…
Cancel
Save