From c232a9a018f27c54a4637d2607fb95cce4702931 Mon Sep 17 00:00:00 2001 From: zhipengl Date: Thu, 23 Aug 2018 00:10:44 +0800 Subject: [PATCH] upgrade cloud-init to CentOS 7.5 version Story: 2003389 Task: 24501 Change-Id: I25f889252a23963fe55f719778aaa9840bd1152b Signed-off-by: zhipengl --- ...te-package-versioning-for-TIS-format.patch | 10 +++++----- .../spec-include-tis-changes.patch | 20 ++++++++++--------- virt/cloud-init/centos/srpm_path | 2 +- 3 files changed, 17 insertions(+), 15 deletions(-) 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 08a522134..1b6a0f238 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 @@ -1,4 +1,4 @@ -From 869e94c0bb51471063fab9fa6bdff54f1db8407e Mon Sep 17 00:00:00 2001 +From 9a97a6ade7470e525b2013b85782b887a96b7489 Mon Sep 17 00:00:00 2001 From: Scott Little Date: Tue, 7 Nov 2017 15:25:12 -0500 Subject: [PATCH] Update-package-versioning-for-TIS-format @@ -8,18 +8,18 @@ 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 89691ae..935c970 100644 +index 390ed96..ef82dd1 100644 --- a/SPECS/cloud-init.spec +++ b/SPECS/cloud-init.spec @@ -7,7 +7,7 @@ Name: cloud-init Version: 0.7.9 --Release: 9%{?dist}.2 -+Release: 9.el7.centos.2%{?_tis_dist}.%{tis_patch_ver} +-Release: 24%{?dist}.1 ++Release: 24.el7.centos.1%{?_tis_dist}.%{tis_patch_ver} Summary: Cloud instance init scripts Group: System Environment/Base -- -1.8.3.1 +2.7.4 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 4ebc1600e..9fddda9fd 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 @@ -1,18 +1,20 @@ -From cd41e4fb7bee4272f1074b4bc4e9c79c7fce3530 Mon Sep 17 00:00:00 2001 +From 1fa41f1116464169399c683abd9920c7bbf28a5b Mon Sep 17 00:00:00 2001 From: Scott Little Date: Wed, 8 Nov 2017 11:13:02 -0500 Subject: [PATCH] spec-include-tis-changes --- - SPECS/cloud-init.spec | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) + SPECS/cloud-init.spec | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/SPECS/cloud-init.spec b/SPECS/cloud-init.spec -index 935c970..a611192 100644 -@@ -44,7 +45,10 @@ Patch0019: 0019-Add-missing-sysconfig-unit-test-data.patch - Patch0020: 0020-Fix-ipv6-subnet-detection.patch - Patch0021: 0021-azure-ensure-that-networkmanager-hook-script-runs.patch - Patch0022: 0022-RHEL-CentOS-Fix-default-routes-for-IPv4-IPv6-configu.patch +index ef82dd1..022e779 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 + -Patch9999: cloud-init-add-centos-os.patch +Patch0999: cloud-init-add-centos-os.patch + @@ -22,5 +24,5 @@ index 935c970..a611192 100644 # Deal with noarch -> arch # https://bugzilla.redhat.com/show_bug.cgi?id=1067089 -- -1.8.3.1 +2.7.4 diff --git a/virt/cloud-init/centos/srpm_path b/virt/cloud-init/centos/srpm_path index 33fb3ec3e..8947c1143 100644 --- a/virt/cloud-init/centos/srpm_path +++ b/virt/cloud-init/centos/srpm_path @@ -1 +1 @@ -mirror:Source/cloud-init-0.7.9-9.el7.centos.2.src.rpm +mirror:Source/cloud-init-0.7.9-24.el7.centos.1.src.rpm