summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Kozhukalov <vkozhukalov@mirantis.com>2016-09-09 11:37:18 +0000
committerVladimir Kozhukalov <vkozhukalov@mirantis.com>2016-09-09 11:37:18 +0000
commit5fd55ab81364d29283b92aa1f336a6722b07c340 (patch)
treeab45a4c5bfddf7c7ffc52f2303ec038fa97d6987
parentc6bf2265d28edeb723d154230b1da48207b0f938 (diff)
Revert "Make sure the ISO tracks the latest merged code"
-rw-r--r--00-debmirror.patch13
-rw-r--r--mirror/ubuntu/module.mk36
2 files changed, 12 insertions, 37 deletions
diff --git a/00-debmirror.patch b/00-debmirror.patch
deleted file mode 100644
index 46302cb..0000000
--- a/00-debmirror.patch
+++ /dev/null
@@ -1,13 +0,0 @@
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 ddceb2d..7a9466e 100644
--- a/mirror/ubuntu/module.mk
+++ b/mirror/ubuntu/module.mk
@@ -24,18 +24,7 @@ Architectures: $(UBUNTU_ARCH)
24VerifyRelease: blindtrust 24VerifyRelease: blindtrust
25endef 25endef
26 26
27define do_debmirror 27
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
39 28
40# Two operation modes: 29# Two operation modes:
41# USE_MIRROR=none - mirroring mode, rsync full mirror from internal build server 30# USE_MIRROR=none - mirroring mode, rsync full mirror from internal build server
@@ -58,18 +47,12 @@ $(reprepro_updates_conf)
58EOF 47EOF
59endef 48endef
60 49
61
62$(BUILD_DIR)/mirror/ubuntu/reprepro_config.done: export config_reprepro:=$(config_reprepro) 50$(BUILD_DIR)/mirror/ubuntu/reprepro_config.done: export config_reprepro:=$(config_reprepro)
63$(BUILD_DIR)/mirror/ubuntu/reprepro_config.done: 51$(BUILD_DIR)/mirror/ubuntu/reprepro_config.done:
64 mkdir -p $(REPREPRO_CONF_DIR) 52 mkdir -p $(REPREPRO_CONF_DIR)
65 sh -c "$${config_reprepro}" 53 sh -c "$${config_reprepro}"
66 $(ACTION.TOUCH) 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$(BUILD_DIR)/mirror/ubuntu/reprepro.done: \ 56$(BUILD_DIR)/mirror/ubuntu/reprepro.done: \
74 $(BUILD_DIR)/mirror/ubuntu/mirror.done \ 57 $(BUILD_DIR)/mirror/ubuntu/mirror.done \
75 $(BUILD_DIR)/mirror/ubuntu/reprepro_config.done 58 $(BUILD_DIR)/mirror/ubuntu/reprepro_config.done
@@ -88,12 +71,17 @@ $(BUILD_DIR)/mirror/ubuntu/repo.done: \
88 rm -rf $(LOCAL_MIRROR_UBUNTU)/lists 71 rm -rf $(LOCAL_MIRROR_UBUNTU)/lists
89 $(ACTION.TOUCH) 72 $(ACTION.TOUCH)
90 73
91$(BUILD_DIR)/mirror/ubuntu/mirror.done: \ 74$(BUILD_DIR)/mirror/ubuntu/mirror.done:
92 $(BUILD_DIR)/mirror/ubuntu/prepare_debmirror.done
93 mkdir -p $(LOCAL_MIRROR_UBUNTU) 75 mkdir -p $(LOCAL_MIRROR_UBUNTU)
94 $(call do_debmirror) 76 set -ex; debmirror --progress --checksums --nocleanup \
95 $(call do_debmirror,-proposed) 77 --nosource --ignore-release-gpg --rsync-extra=none \
96 $(call do_debmirror,-updates) 78 --exclude-deb-section='^debug$$' \
97 $(call do_debmirror,-security) 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 rm -rf $(LOCAL_MIRROR_UBUNTU)/.temp $(LOCAL_MIRROR_UBUNTU)/project 86 rm -rf $(LOCAL_MIRROR_UBUNTU)/.temp $(LOCAL_MIRROR_UBUNTU)/project
99 $(ACTION.TOUCH) 87 $(ACTION.TOUCH)