starlingx/integ
Code Issues Proposed changes

upgrade cloud-init to CentOS 7.5 version

Browse Source 
Story: 2003389
Task: 24501

Change-Id: I25f889252a23963fe55f719778aaa9840bd1152b
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
This commit is contained in:
zhipengl 2018-08-23 00:10:44 +08:00 committed by Lin Shuicheng
parent 509a975d20
commit c232a9a018
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
virt/cloud-init/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
View File

@ -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 <scott.little@windriver.com> From: Scott Little <scott.little@windriver.com>
Date: Tue, 7 Nov 2017 15:25:12 -0500 Date: Tue, 7 Nov 2017 15:25:12 -0500
Subject: [PATCH] Update-package-versioning-for-TIS-format 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(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/cloud-init.spec b/SPECS/cloud-init.spec 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 --- a/SPECS/cloud-init.spec
+++ b/SPECS/cloud-init.spec +++ b/SPECS/cloud-init.spec
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
Name: cloud-init Name: cloud-init
Version: 0.7.9 Version: 0.7.9
-Release: 9%{?dist}.2 -Release: 24%{?dist}.1
+Release: 9.el7.centos.2%{?_tis_dist}.%{tis_patch_ver} +Release: 24.el7.centos.1%{?_tis_dist}.%{tis_patch_ver}
Summary: Cloud instance init scripts Summary: Cloud instance init scripts
Group: System Environment/Base Group: System Environment/Base
-- --
1.8.3.1 2.7.4

20
virt/cloud-init/centos/meta_patches/spec-include-tis-changes.patch
View File

@ -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 <scott.little@windriver.com> From: Scott Little <scott.little@windriver.com>
Date: Wed, 8 Nov 2017 11:13:02 -0500 Date: Wed, 8 Nov 2017 11:13:02 -0500
Subject: [PATCH] spec-include-tis-changes Subject: [PATCH] spec-include-tis-changes
--- ---
SPECS/cloud-init.spec | 8 ++++++-- SPECS/cloud-init.spec | 5 ++++-
1 file changed, 6 insertions(+), 2 deletions(-) 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/SPECS/cloud-init.spec b/SPECS/cloud-init.spec diff --git a/SPECS/cloud-init.spec b/SPECS/cloud-init.spec
index 935c970..a611192 100644 index ef82dd1..022e779 100644
@@ -44,7 +45,10 @@ Patch0019: 0019-Add-missing-sysconfig-unit-test-data.patch --- a/SPECS/cloud-init.spec
Patch0020: 0020-Fix-ipv6-subnet-detection.patch +++ b/SPECS/cloud-init.spec
Patch0021: 0021-azure-ensure-that-networkmanager-hook-script-runs.patch @@ -69,7 +69,10 @@ Patch41: ci-DataSourceAzure.py-use-hostnamectl-to-set-hostname.patch
Patch0022: 0022-RHEL-CentOS-Fix-default-routes-for-IPv4-IPv6-configu.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 -Patch9999: cloud-init-add-centos-os.patch
+Patch0999: 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 # Deal with noarch -> arch
# https://bugzilla.redhat.com/show_bug.cgi?id=1067089 # https://bugzilla.redhat.com/show_bug.cgi?id=1067089
-- --
1.8.3.1 2.7.4

2
virt/cloud-init/centos/srpm_path
View File

@ -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