summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Teselkin <dteselkin@mirantis.com>2016-07-26 14:01:12 +0300
committerValeriy Sakharov <vsakharov@mirantis.com>2016-09-01 17:51:09 +0300
commitc6bf2265d28edeb723d154230b1da48207b0f938 (patch)
treedb3d6acaf48cb982a6120917ad46f7d21c449bf8
parentead49981075c7dc064e3aa67acd456c76aadefc5 (diff)
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
-rw-r--r--00-debmirror.patch13
-rw-r--r--mirror/ubuntu/module.mk36
2 files changed, 37 insertions, 12 deletions
diff --git a/00-debmirror.patch b/00-debmirror.patch
new file mode 100644
index 0000000..46302cb
--- /dev/null
+++ b/00-debmirror.patch
@@ -0,0 +1,13 @@
1diff --git a/debmirror b/debmirror
2index 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;
diff --git a/mirror/ubuntu/module.mk b/mirror/ubuntu/module.mk
index 7a9466e..ddceb2d 100644
--- a/mirror/ubuntu/module.mk
+++ b/mirror/ubuntu/module.mk
@@ -24,7 +24,18 @@ Architectures: $(UBUNTU_ARCH)
24VerifyRelease: blindtrust 24VerifyRelease: blindtrust
25endef 25endef
26 26
27 27define do_debmirror
28set -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)/
38endef
28 39
29# Two operation modes: 40# Two operation modes:
30# USE_MIRROR=none - mirroring mode, rsync full mirror from internal build server 41# USE_MIRROR=none - mirroring mode, rsync full mirror from internal build server
@@ -47,12 +58,18 @@ $(reprepro_updates_conf)
47EOF 58EOF
48endef 59endef
49 60
61
50$(BUILD_DIR)/mirror/ubuntu/reprepro_config.done: export config_reprepro:=$(config_reprepro) 62$(BUILD_DIR)/mirror/ubuntu/reprepro_config.done: export config_reprepro:=$(config_reprepro)
51$(BUILD_DIR)/mirror/ubuntu/reprepro_config.done: 63$(BUILD_DIR)/mirror/ubuntu/reprepro_config.done:
52 mkdir -p $(REPREPRO_CONF_DIR) 64 mkdir -p $(REPREPRO_CONF_DIR)
53 sh -c "$${config_reprepro}" 65 sh -c "$${config_reprepro}"
54 $(ACTION.TOUCH) 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$(BUILD_DIR)/mirror/ubuntu/reprepro.done: \ 73$(BUILD_DIR)/mirror/ubuntu/reprepro.done: \
57 $(BUILD_DIR)/mirror/ubuntu/mirror.done \ 74 $(BUILD_DIR)/mirror/ubuntu/mirror.done \
58 $(BUILD_DIR)/mirror/ubuntu/reprepro_config.done 75 $(BUILD_DIR)/mirror/ubuntu/reprepro_config.done
@@ -71,17 +88,12 @@ $(BUILD_DIR)/mirror/ubuntu/repo.done: \
71 rm -rf $(LOCAL_MIRROR_UBUNTU)/lists 88 rm -rf $(LOCAL_MIRROR_UBUNTU)/lists
72 $(ACTION.TOUCH) 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 mkdir -p $(LOCAL_MIRROR_UBUNTU) 93 mkdir -p $(LOCAL_MIRROR_UBUNTU)
76 set -ex; debmirror --progress --checksums --nocleanup \ 94 $(call do_debmirror)
77 --nosource --ignore-release-gpg --rsync-extra=none \ 95 $(call do_debmirror,-proposed)
78 --exclude-deb-section='^debug$$' \ 96 $(call do_debmirror,-updates)
79 --method=$(MIRROR_MOS_UBUNTU_METHOD) \ 97 $(call do_debmirror,-security)
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)/
86 rm -rf $(LOCAL_MIRROR_UBUNTU)/.temp $(LOCAL_MIRROR_UBUNTU)/project 98 rm -rf $(LOCAL_MIRROR_UBUNTU)/.temp $(LOCAL_MIRROR_UBUNTU)/project
87 $(ACTION.TOUCH) 99 $(ACTION.TOUCH)