From 2ae727788d61371e2cd99fd2d9665b9fa7f8c13f Mon Sep 17 00:00:00 2001 From: Shuicheng Lin Date: Mon, 3 Dec 2018 18:44:15 +0800 Subject: [PATCH] de-fuzz fuzzy patch in cluster-resource-agents 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 --- .../0001-Update-package-versioning-for-TIS-format.patch | 2 -- .../centos/meta_patches/spec-avoid-dir-collisions.patch | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/base/cluster-resource-agents/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/base/cluster-resource-agents/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch index 7a1aff353..a31639f85 100644 --- a/base/cluster-resource-agents/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch +++ b/base/cluster-resource-agents/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch @@ -3,8 +3,6 @@ From: Scott Little Date: Mon, 2 Oct 2017 15:11:59 -0400 Subject: [PATCH] WRS: 0001-Update-package-versioning-for-TIS-format.patch -Conflicts: - SPECS/resource-agents.spec --- SPECS/resource-agents.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/cluster-resource-agents/centos/meta_patches/spec-avoid-dir-collisions.patch b/base/cluster-resource-agents/centos/meta_patches/spec-avoid-dir-collisions.patch index f0c73aedc..47c974d23 100644 --- a/base/cluster-resource-agents/centos/meta_patches/spec-avoid-dir-collisions.patch +++ b/base/cluster-resource-agents/centos/meta_patches/spec-avoid-dir-collisions.patch @@ -12,7 +12,7 @@ diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec index ec85fc2..bb96485 100644 --- a/SPECS/resource-agents.spec +++ b/SPECS/resource-agents.spec -@@ -722,14 +722,11 @@ rm -rf %{buildroot} +@@ -723,14 +723,11 @@ rm -rf %{buildroot} %endif %if %{with linuxha} @@ -31,7 +31,7 @@ index ec85fc2..bb96485 100644 %if %{with rgmanager} /usr/lib/ocf/resource.d/redhat %endif -@@ -752,8 +749,6 @@ rm -rf %{buildroot} +@@ -753,8 +750,6 @@ rm -rf %{buildroot} %{_includedir}/heartbeat @@ -40,7 +40,7 @@ index ec85fc2..bb96485 100644 %{_mandir}/man7/*.7* ### -@@ -863,7 +858,6 @@ rm -rf %{buildroot} +@@ -864,7 +859,6 @@ rm -rf %{buildroot} %exclude %{_mandir}/man8/ldirectord.8.gz # For compatability with pre-existing agents