starlingx/integ
Code Issues Proposed changes

de-fuzz fuzzy patch in cluster-resource-agents

Browse Source 
Closes-Bug: 1806298

Fuzzy patch may cause build failure. Correct the line num
to de-fuzz it.

Test:
Pass build and multi node deploy test.

Change-Id: I3e0783a17738d35986c675a8125b12d7c6378671
Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
This commit is contained in:
Shuicheng Lin 2018-12-03 18:44:15 +08:00
parent 7986a987bb
commit 2ae727788d
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base/cluster-resource-agents/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
View File

@ -3,8 +3,6 @@ From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 15:11:59 -0400 Date: Mon, 2 Oct 2017 15:11:59 -0400
Subject: [PATCH] WRS: 0001-Update-package-versioning-for-TIS-format.patch Subject: [PATCH] WRS: 0001-Update-package-versioning-for-TIS-format.patch
Conflicts:
SPECS/resource-agents.spec
--- ---
SPECS/resource-agents.spec | 2 +- SPECS/resource-agents.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)

6
base/cluster-resource-agents/centos/meta_patches/spec-avoid-dir-collisions.patch
View File

@ -12,7 +12,7 @@ diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec
index ec85fc2..bb96485 100644 index ec85fc2..bb96485 100644
--- a/SPECS/resource-agents.spec --- a/SPECS/resource-agents.spec
+++ b/SPECS/resource-agents.spec +++ b/SPECS/resource-agents.spec
@@ -722,14 +722,11 @@ rm -rf %{buildroot} @@ -723,14 +723,11 @@ rm -rf %{buildroot}
%endif %endif
%if %{with linuxha} %if %{with linuxha}
@ -31,7 +31,7 @@ index ec85fc2..bb96485 100644
%if %{with rgmanager} %if %{with rgmanager}
/usr/lib/ocf/resource.d/redhat /usr/lib/ocf/resource.d/redhat
%endif %endif
@@ -752,8 +749,6 @@ rm -rf %{buildroot} @@ -753,8 +750,6 @@ rm -rf %{buildroot}
%{_includedir}/heartbeat %{_includedir}/heartbeat
@ -40,7 +40,7 @@ index ec85fc2..bb96485 100644
%{_mandir}/man7/*.7* %{_mandir}/man7/*.7*
### ###
@@ -863,7 +858,6 @@ rm -rf %{buildroot} @@ -864,7 +859,6 @@ rm -rf %{buildroot}
%exclude %{_mandir}/man8/ldirectord.8.gz %exclude %{_mandir}/man8/ldirectord.8.gz
# For compatability with pre-existing agents # For compatability with pre-existing agents