starlingx/integ
Code Issues Proposed changes

Refactor meta patch for facter package

Browse Source 
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 <zhipengs.liu@intel.com>
This commit is contained in:
zhipengl 2018-12-11 22:51:33 +08:00
parent 4f3e626029
commit 2ec4482fc7
3 changed files with 17 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
config/facter/centos/meta_patches/0001-spec-include-TiS-paches.patch
View File

@ -4,8 +4,8 @@ Date: Mon, 20 Mar 2017 09:58:00 -0400
Subject: [PATCH 1/2] WRS: spec-include-TiS-paches.patch Subject: [PATCH 1/2] WRS: spec-include-TiS-paches.patch
--- ---
SPECS/facter.spec | 12 ++++++++++++ SPECS/facter.spec | 13 +++++++++++++
1 file changed, 12 insertions(+) 1 file changed, 13 insertions(+)
diff --git a/SPECS/facter.spec b/SPECS/facter.spec diff --git a/SPECS/facter.spec b/SPECS/facter.spec
index 97ee783..7996d45 100644 index 97ee783..7996d45 100644
@ -16,24 +16,25 @@ index 97ee783..7996d45 100644
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# WRS patches +# WRS patches
+Patch0: ps.patch +Patch0001: 0001-ps.patch
+Patch1: personality.patch +Patch0002: 0002-personality.patch
+Patch2: centos_remove-net-commands-that-can-timeout.patch +Patch0003: 0003-centos_remove-net-commands-that-can-timeout.patch
+Patch3: centos_fix-ipv6-regex.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 # Upstream claims to only support 1.8.7 and higher
BuildRequires: ruby >= 1.8.7 BuildRequires: ruby >= 1.8.7
BuildRequires: ruby-devel 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 %prep
%setup -q %setup -q
+# WRS apply patches +# WRS apply patches
+%patch0 -p1 +%patch0001 -p1
+%patch1 -p1 +%patch0002 -p1
+%patch2 -p2 +%patch0003 -p2
+%patch3 -p2 +%patch0004 -p2
+%patch0005 -p1
%build %build
# Nothing to build # Nothing to build

48
config/facter/centos/meta_patches/0003-Add-ipaddress-patch.patch
View File

@ -1,48 +0,0 @@
From 26fa177280c21f0c2048c90ae8fdd3ded7a60113 Mon Sep 17 00:00:00 2001
From: Don Penney <don.penney@windriver.com>
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

1
config/facter/centos/meta_patches/PATCH_ORDER
View File

@ -1,3 +1,2 @@
0001-spec-include-TiS-paches.patch 0001-spec-include-TiS-paches.patch
0002-Update-package-versioning-for-TIS-format.patch 0002-Update-package-versioning-for-TIS-format.patch
0003-Add-ipaddress-patch.patch