From 2ec4482fc766bd583df422c2df5939a2707c7996 Mon Sep 17 00:00:00 2001 From: zhipengl Date: Tue, 11 Dec 2018 22:51:33 +0800 Subject: [PATCH] Refactor meta patch for facter package Merge 2 meta patches as the first meta patch is just overwritted by second one. Build pass! Story: 2003768 Task: 28458 Change-Id: I02ccadafa5381c82bcace340f6c399af38aeecc7 Signed-off-by: zhipengl --- .../0001-spec-include-TiS-paches.patch | 33 ++++++------- .../0003-Add-ipaddress-patch.patch | 48 ------------------- config/facter/centos/meta_patches/PATCH_ORDER | 1 - 3 files changed, 17 insertions(+), 65 deletions(-) delete mode 100644 config/facter/centos/meta_patches/0003-Add-ipaddress-patch.patch diff --git a/config/facter/centos/meta_patches/0001-spec-include-TiS-paches.patch b/config/facter/centos/meta_patches/0001-spec-include-TiS-paches.patch index 3284b2d7f..f12a78339 100644 --- a/config/facter/centos/meta_patches/0001-spec-include-TiS-paches.patch +++ b/config/facter/centos/meta_patches/0001-spec-include-TiS-paches.patch @@ -4,8 +4,8 @@ Date: Mon, 20 Mar 2017 09:58:00 -0400 Subject: [PATCH 1/2] WRS: spec-include-TiS-paches.patch --- - SPECS/facter.spec | 12 ++++++++++++ - 1 file changed, 12 insertions(+) + SPECS/facter.spec | 13 +++++++++++++ + 1 file changed, 13 insertions(+) diff --git a/SPECS/facter.spec b/SPECS/facter.spec index 97ee783..7996d45 100644 @@ -14,29 +14,30 @@ index 97ee783..7996d45 100644 @@ -31,6 +31,13 @@ Source0: https://downloads.puppetlabs.com/%{name}/%{name}-%{version}.tar. Source1: https://downloads.puppetlabs.com/%{name}/%{name}-%{version}.tar.gz.asc BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - + +# WRS patches -+Patch0: ps.patch -+Patch1: personality.patch -+Patch2: centos_remove-net-commands-that-can-timeout.patch -+Patch3: centos_fix-ipv6-regex.patch -+ ++Patch0001: 0001-ps.patch ++Patch0002: 0002-personality.patch ++Patch0003: 0003-centos_remove-net-commands-that-can-timeout.patch ++Patch0004: 0004-centos_fix-ipv6-regex.patch ++Patch0005: 0005-Hardcode-ipaddress-fact-to-localhost.patch + # Upstream claims to only support 1.8.7 and higher BuildRequires: ruby >= 1.8.7 BuildRequires: ruby-devel -@@ -71,6 +78,11 @@ key off the values returned by facts. - +@@ -71,6 +78,12 @@ key off the values returned by facts. + %prep %setup -q +# WRS apply patches -+%patch0 -p1 -+%patch1 -p1 -+%patch2 -p2 -+%patch3 -p2 - ++%patch0001 -p1 ++%patch0002 -p1 ++%patch0003 -p2 ++%patch0004 -p2 ++%patch0005 -p1 + %build # Nothing to build --- +-- 1.8.3.1 diff --git a/config/facter/centos/meta_patches/0003-Add-ipaddress-patch.patch b/config/facter/centos/meta_patches/0003-Add-ipaddress-patch.patch deleted file mode 100644 index ee5ca6ff3..000000000 --- a/config/facter/centos/meta_patches/0003-Add-ipaddress-patch.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 26fa177280c21f0c2048c90ae8fdd3ded7a60113 Mon Sep 17 00:00:00 2001 -From: Don Penney -Date: Thu, 26 Oct 2017 10:44:17 -0400 -Subject: [PATCH] Add ipaddress patch - ---- - SPECS/facter.spec | 18 ++++++++++-------- - 1 file changed, 10 insertions(+), 8 deletions(-) - -diff --git a/SPECS/facter.spec b/SPECS/facter.spec -index aa4a0db..2829879 100644 ---- a/SPECS/facter.spec -+++ b/SPECS/facter.spec -@@ -32,10 +32,11 @@ Source1: https://downloads.puppetlabs.com/%{name}/%{name}-%{version}.tar. - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - - # WRS patches --Patch0: ps.patch --Patch1: personality.patch --Patch2: centos_remove-net-commands-that-can-timeout.patch --Patch3: centos_fix-ipv6-regex.patch -+Patch0001: 0001-ps.patch -+Patch0002: 0002-personality.patch -+Patch0003: 0003-centos_remove-net-commands-that-can-timeout.patch -+Patch0004: 0004-centos_fix-ipv6-regex.patch -+Patch0005: 0005-Hardcode-ipaddress-fact-to-localhost.patch - - - # Upstream claims to only support 1.8.7 and higher -@@ -79,10 +80,11 @@ key off the values returned by facts. - %prep - %setup -q - # WRS apply patches --%patch0 -p1 --%patch1 -p1 --%patch2 -p2 --%patch3 -p2 -+%patch0001 -p1 -+%patch0002 -p1 -+%patch0003 -p2 -+%patch0004 -p2 -+%patch0005 -p1 - - %build - # Nothing to build --- -1.8.3.1 - diff --git a/config/facter/centos/meta_patches/PATCH_ORDER b/config/facter/centos/meta_patches/PATCH_ORDER index 00edf2f3a..aef6d299e 100644 --- a/config/facter/centos/meta_patches/PATCH_ORDER +++ b/config/facter/centos/meta_patches/PATCH_ORDER @@ -1,3 +1,2 @@ 0001-spec-include-TiS-paches.patch 0002-Update-package-versioning-for-TIS-format.patch -0003-Add-ipaddress-patch.patch