From e8e689c1491290f5de284fc4911e222e22bf9614 Mon Sep 17 00:00:00 2001 From: Long Li Date: Wed, 20 Nov 2019 17:18:26 +0800 Subject: [PATCH] CentOS 8: Upgrade cloud-init to version 18.2 (1)Release Version Upgrade (2)Matching code changes with el7 to el8 Story: 2006729 Task: 37682 Depends-On: https://review.opendev.org/#/c/696481/ Depends-On: https://review.opendev.org/#/c/696050/ Change-Id: I7ef21a833d29d79c18309b200c9ae7b9c84a16d3 Signed-off-by: Long Li --- virt/cloud-init/centos/build_srpm.data | 2 +- ...te-package-versioning-for-TIS-format.patch | 10 ++++----- .../spec-include-tis-changes.patch | 21 ++++++++----------- .../cloud-init-interactive-parted.patch | 4 ++-- virt/cloud-init/centos/srpm_path | 2 +- 5 files changed, 18 insertions(+), 21 deletions(-) diff --git a/virt/cloud-init/centos/build_srpm.data b/virt/cloud-init/centos/build_srpm.data index 0eac83bbb..8aeb55368 100644 --- a/virt/cloud-init/centos/build_srpm.data +++ b/virt/cloud-init/centos/build_srpm.data @@ -1 +1 @@ -TIS_PATCH_VER=4 +TIS_PATCH_VER=1 diff --git a/virt/cloud-init/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/virt/cloud-init/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch index 1b6a0f238..14b3cc75e 100644 --- a/virt/cloud-init/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch +++ b/virt/cloud-init/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch @@ -8,15 +8,15 @@ Subject: [PATCH] Update-package-versioning-for-TIS-format 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPECS/cloud-init.spec b/SPECS/cloud-init.spec -index 390ed96..ef82dd1 100644 +index 60bf175..a873d81 100644 --- a/SPECS/cloud-init.spec +++ b/SPECS/cloud-init.spec -@@ -7,7 +7,7 @@ +@@ -6,7 +6,7 @@ Name: cloud-init - Version: 0.7.9 --Release: 24%{?dist}.1 -+Release: 24.el7.centos.1%{?_tis_dist}.%{tis_patch_ver} + Version: 18.2 +-Release: 6%{?dist} ++Release: 6.el8%{?_tis_dist}.%{tis_patch_ver} Summary: Cloud instance init scripts Group: System Environment/Base diff --git a/virt/cloud-init/centos/meta_patches/spec-include-tis-changes.patch b/virt/cloud-init/centos/meta_patches/spec-include-tis-changes.patch index 9fddda9fd..dcc1b1f7c 100644 --- a/virt/cloud-init/centos/meta_patches/spec-include-tis-changes.patch +++ b/virt/cloud-init/centos/meta_patches/spec-include-tis-changes.patch @@ -4,25 +4,22 @@ Date: Wed, 8 Nov 2017 11:13:02 -0500 Subject: [PATCH] spec-include-tis-changes --- - SPECS/cloud-init.spec | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) + SPECS/cloud-init.spec | 2 ++ + 1 file changed, 2 insertions(+) diff --git a/SPECS/cloud-init.spec b/SPECS/cloud-init.spec -index ef82dd1..022e779 100644 +index a873d81..1175601 100644 --- a/SPECS/cloud-init.spec +++ b/SPECS/cloud-init.spec -@@ -69,7 +69,10 @@ Patch41: ci-DataSourceAzure.py-use-hostnamectl-to-set-hostname.patch - # For bz#1578702 - cloud-init-0.7.9-9.el7_4.6 breaks IPv4/IPv6 dual-stack EC2 instances in AWS [rhel-7.5.z] - Patch42: ci-sysconfig-Don-t-disable-IPV6_AUTOCONF.patch +@@ -38,6 +38,8 @@ Patch15: ci-Fix-string-missmatch-when-mounting-ntfs.patch + # For bz#1602784 - cloud-init: Sometimes image boots fingerprints is configured, there's a network device present but it's not configured + Patch16: ci-net-Make-sysconfig-renderer-compatible-with-Network-.patch --Patch9999: cloud-init-add-centos-os.patch -+Patch0999: cloud-init-add-centos-os.patch ++Patch1000: cloud-init-interactive-parted.patch + -+# WRS patches -+Patch2000: cloud-init-interactive-parted.patch + BuildArch: noarch - # Deal with noarch -> arch - # https://bugzilla.redhat.com/show_bug.cgi?id=1067089 + BuildRequires: pkgconfig(systemd) -- 2.7.4 diff --git a/virt/cloud-init/centos/patches/cloud-init-interactive-parted.patch b/virt/cloud-init/centos/patches/cloud-init-interactive-parted.patch index facd62471..488d2d49b 100644 --- a/virt/cloud-init/centos/patches/cloud-init-interactive-parted.patch +++ b/virt/cloud-init/centos/patches/cloud-init-interactive-parted.patch @@ -8,7 +8,7 @@ Subject: [PATCH] cloud-init-interactive-parted 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudinit/config/cc_growpart.py b/cloudinit/config/cc_growpart.py -index 832bb3f..71c4f7f 100644 +index bafca9d..88e7bbb 100644 --- a/cloudinit/config/cc_growpart.py +++ b/cloudinit/config/cc_growpart.py @@ -182,7 +182,7 @@ class ResizeGpart(object): @@ -21,5 +21,5 @@ index 832bb3f..71c4f7f 100644 util.logexc(LOG, "Failed: gpart resize -i %s %s", partnum, diskdev) raise ResizeFailedException(e) -- -1.8.3.1 +2.7.4 diff --git a/virt/cloud-init/centos/srpm_path b/virt/cloud-init/centos/srpm_path index 8947c1143..6f8418d6e 100644 --- a/virt/cloud-init/centos/srpm_path +++ b/virt/cloud-init/centos/srpm_path @@ -1 +1 @@ -mirror:Source/cloud-init-0.7.9-24.el7.centos.1.src.rpm +mirror:Source/cloud-init-18.2-6.el8.src.rpm