c522cb6310
When do Centos 7.5 upgraded, some patches didn't resolve and cause the fuzzy in the line numbers of the patches. And it may cause .orig file is created when do patch. And this .orig file will lead to rpm packaging failure due to the unexpected and unpackaged .orig file. Please visit below link to get more detail info: https://bugs.launchpad.net/starlingx/+bug/1794611 Solution: Safest solution is to de-fuzz our patches. Story: 2003389 Task: 26755 Change-Id: Id45e12fbacccec6c68e7c65994b0dca9955bfcaf Signed-off-by: slin14 <shuicheng.lin@intel.com>
27 lines
990 B
Diff
27 lines
990 B
Diff
From 1a8a5cd52c489dc419653e24f9042f9dd87ce9bc Mon Sep 17 00:00:00 2001
|
|
From: Don Penney <don.penney@windriver.com>
|
|
Date: Thu, 2 Nov 2017 11:03:43 -0400
|
|
Subject: [PATCH] Add iscsi-shutdown.service patch
|
|
|
|
---
|
|
SPECS/iscsi-initiator-utils.spec | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/SPECS/iscsi-initiator-utils.spec b/SPECS/iscsi-initiator-utils.spec
|
|
index 8865737..ce25ad4 100644
|
|
--- a/SPECS/iscsi-initiator-utils.spec
|
|
+++ b/SPECS/iscsi-initiator-utils.spec
|
|
@@ -59,7 +59,8 @@ Patch198: keep-open-isns.patch
|
|
Patch199: 0199-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
|
|
|
|
# WRS
|
|
-Patch200: increase-default-error-timeouts-for-iSCSI-initiator.patch
|
|
+Patch10001: 0001-increase-default-error-timeouts-for-iSCSI-initiator.patch
|
|
+Patch10002: 0002-Add-dependency-against-network.service-to-iscsi-shut.patch
|
|
|
|
BuildRequires: flex bison python-devel doxygen kmod-devel systemd-devel libmount-devel autoconf automake libtool
|
|
# For dir ownership
|
|
--
|
|
2.7.4
|
|
|