c22442cf09
Problem: - Centos 7.5 upgraded resource-agentss. - Porting of resource-agentss patches did not resolve and 'fuzz' in the line numbers of the patches. - If resource-agents is built by rpm 4.11, or default version of rpm until 4.14 is compiled, a fuzzy patch results in the creating of an .orig file. - Packaging of resource-agentss failes due to the unexpected, and unpackaged .orig file Solution: Safest solution is to de-fuzz our resource-agentss patches. Story: 2003389 Task: 26755 Change-Id: I14d975368f5e70eea5bae6ac8dcfed2cfd6711ff Signed-off-by: Sun Austin <austin.sun@intel.com>
33 lines
946 B
Diff
33 lines
946 B
Diff
From 87673fd8f797034a206ac4e54ac85d258daece13 Mon Sep 17 00:00:00 2001
|
|
From: Scott Little <scott.little@windriver.com>
|
|
Date: Mon, 2 Oct 2017 15:11:59 -0400
|
|
Subject: [PATCH 09/10] WRS: ipaddr2-if-down.patch
|
|
|
|
---
|
|
SPECS/resource-agents.spec | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec
|
|
index fd8bc97..bbf2754 100644
|
|
--- a/SPECS/resource-agents.spec
|
|
+++ b/SPECS/resource-agents.spec
|
|
@@ -277,6 +277,7 @@ Patch1114: notify-rmon-of-shutdown-before-shutting-down.patch
|
|
Patch1115: Fix-VG-activity-bug-in-heartbeat-LVM-script.patch
|
|
Patch1116: ocf-shellfuncs_change_logtag.patch
|
|
Patch1117: lvm_cleanup_refs_on_stop.patch
|
|
+Patch1118: ipaddr2_if_down.patch
|
|
|
|
Obsoletes: heartbeat-resources <= %{version}
|
|
Provides: heartbeat-resources = %{version}
|
|
@@ -611,6 +612,7 @@ exit 1
|
|
%patch1115 -p1
|
|
%patch1116 -p1
|
|
%patch1117 -p1
|
|
+%patch1118 -p1
|
|
|
|
%build
|
|
if [ ! -f configure ]; then
|
|
--
|
|
2.7.4
|
|
|