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
This commit is contained in:
parent
ead4998107
commit
c6bf2265d2
|
@ -0,0 +1,13 @@
|
||||||
|
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;
|
|
@ -24,7 +24,18 @@ Architectures: $(UBUNTU_ARCH)
|
||||||
VerifyRelease: blindtrust
|
VerifyRelease: blindtrust
|
||||||
endef
|
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:
|
# Two operation modes:
|
||||||
# USE_MIRROR=none - mirroring mode, rsync full mirror from internal build server
|
# USE_MIRROR=none - mirroring mode, rsync full mirror from internal build server
|
||||||
|
@ -47,12 +58,18 @@ $(reprepro_updates_conf)
|
||||||
EOF
|
EOF
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
|
||||||
$(BUILD_DIR)/mirror/ubuntu/reprepro_config.done: export config_reprepro:=$(config_reprepro)
|
$(BUILD_DIR)/mirror/ubuntu/reprepro_config.done: export config_reprepro:=$(config_reprepro)
|
||||||
$(BUILD_DIR)/mirror/ubuntu/reprepro_config.done:
|
$(BUILD_DIR)/mirror/ubuntu/reprepro_config.done:
|
||||||
mkdir -p $(REPREPRO_CONF_DIR)
|
mkdir -p $(REPREPRO_CONF_DIR)
|
||||||
sh -c "$${config_reprepro}"
|
sh -c "$${config_reprepro}"
|
||||||
$(ACTION.TOUCH)
|
$(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/reprepro.done: \
|
||||||
$(BUILD_DIR)/mirror/ubuntu/mirror.done \
|
$(BUILD_DIR)/mirror/ubuntu/mirror.done \
|
||||||
$(BUILD_DIR)/mirror/ubuntu/reprepro_config.done
|
$(BUILD_DIR)/mirror/ubuntu/reprepro_config.done
|
||||||
|
@ -71,17 +88,12 @@ $(BUILD_DIR)/mirror/ubuntu/repo.done: \
|
||||||
rm -rf $(LOCAL_MIRROR_UBUNTU)/lists
|
rm -rf $(LOCAL_MIRROR_UBUNTU)/lists
|
||||||
$(ACTION.TOUCH)
|
$(ACTION.TOUCH)
|
||||||
|
|
||||||
$(BUILD_DIR)/mirror/ubuntu/mirror.done:
|
$(BUILD_DIR)/mirror/ubuntu/mirror.done: \
|
||||||
|
$(BUILD_DIR)/mirror/ubuntu/prepare_debmirror.done
|
||||||
mkdir -p $(LOCAL_MIRROR_UBUNTU)
|
mkdir -p $(LOCAL_MIRROR_UBUNTU)
|
||||||
set -ex; debmirror --progress --checksums --nocleanup \
|
$(call do_debmirror)
|
||||||
--nosource --ignore-release-gpg --rsync-extra=none \
|
$(call do_debmirror,-proposed)
|
||||||
--exclude-deb-section='^debug$$' \
|
$(call do_debmirror,-updates)
|
||||||
--method=$(MIRROR_MOS_UBUNTU_METHOD) \
|
$(call do_debmirror,-security)
|
||||||
--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
|
rm -rf $(LOCAL_MIRROR_UBUNTU)/.temp $(LOCAL_MIRROR_UBUNTU)/project
|
||||||
$(ACTION.TOUCH)
|
$(ACTION.TOUCH)
|
||||||
|
|
Loading…
Reference in New Issue