From c522cb6310301e15973feb90a2acaa0f9c7ba77b Mon Sep 17 00:00:00 2001 From: slin14 Date: Fri, 28 Sep 2018 07:54:56 +0800 Subject: [PATCH] de-fuzz iscsi-initiator-utils patches 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 --- .../0001-spec-include-TiS-changes.patch | 16 ++++++++-------- .../0003-Add-iscsi-shutdown.service-patch.patch | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/filesystem/iscsi-initiator-utils/centos/meta_patches/0001-spec-include-TiS-changes.patch b/filesystem/iscsi-initiator-utils/centos/meta_patches/0001-spec-include-TiS-changes.patch index 4979dd289..8b536277c 100644 --- a/filesystem/iscsi-initiator-utils/centos/meta_patches/0001-spec-include-TiS-changes.patch +++ b/filesystem/iscsi-initiator-utils/centos/meta_patches/0001-spec-include-TiS-changes.patch @@ -1,4 +1,4 @@ -From 70c42ca7d05032305e77b7ea10d003cac0b932ef Mon Sep 17 00:00:00 2001 +From 5a1612476a2b2a4783b5a1bd0f5493b3b3974ecb Mon Sep 17 00:00:00 2001 From: Scott Little Date: Mon, 2 Oct 2017 16:19:19 -0400 Subject: [PATCH 1/2] WRS: spec-include-TiS-changes.patch @@ -8,7 +8,7 @@ Subject: [PATCH 1/2] WRS: spec-include-TiS-changes.patch 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/SPECS/iscsi-initiator-utils.spec b/SPECS/iscsi-initiator-utils.spec -index e164c03..ce2198d 100644 +index a7bd696..847f95c 100644 --- a/SPECS/iscsi-initiator-utils.spec +++ b/SPECS/iscsi-initiator-utils.spec @@ -13,6 +13,9 @@ Source0: https://github.com/open-iscsi/open-iscsi/archive/%{open_iscsi_version}. @@ -21,7 +21,7 @@ index e164c03..ce2198d 100644 # upstream patches, post last tagged version Patch1: open-iscsi-2.0.874-1-iBFT-origin-is-an-enum-not-a-string.patch Patch2: open-iscsi-2.0.874-4-iscsid-treat-SIGTERM-like-iscsiadm-k-0.patch -@@ -54,6 +57,9 @@ Patch198: keep-open-isns.patch +@@ -55,6 +58,9 @@ Patch198: keep-open-isns.patch # version string, needs to be updated with each build Patch199: 0199-use-Red-Hat-version-string-to-match-RPM-package-vers.patch @@ -31,7 +31,7 @@ index e164c03..ce2198d 100644 BuildRequires: flex bison python-devel doxygen kmod-devel systemd-devel libmount-devel autoconf automake libtool # For dir ownership Requires: %{name}-iscsiuio >= %{version}-%{release} -@@ -167,6 +173,9 @@ touch $RPM_BUILD_ROOT/var/lock/iscsi/lock +@@ -168,6 +174,9 @@ touch $RPM_BUILD_ROOT/var/lock/iscsi/lock %{__install} -pm 755 libiscsi/build/lib.linux-*/libiscsimodule.so \ $RPM_BUILD_ROOT%{python_sitearch} @@ -41,7 +41,7 @@ index e164c03..ce2198d 100644 %post /sbin/ldconfig -@@ -229,13 +238,13 @@ fi +@@ -232,13 +241,13 @@ fi %files %doc README @@ -62,7 +62,7 @@ index e164c03..ce2198d 100644 %ghost %{_var}/lock/iscsi %ghost %{_var}/lock/iscsi/lock %{_unitdir}/iscsi.service -@@ -245,8 +254,8 @@ fi +@@ -248,8 +257,8 @@ fi %{_libexecdir}/iscsi-mark-root-nodes %{_sysconfdir}/NetworkManager/dispatcher.d/04-iscsi %{_tmpfilesdir}/iscsi.conf @@ -73,7 +73,7 @@ index e164c03..ce2198d 100644 %{_sbindir}/iscsi-iname %{_sbindir}/iscsiadm %{_sbindir}/iscsid -@@ -258,6 +267,9 @@ fi +@@ -261,6 +270,9 @@ fi %{_mandir}/man8/iscsid.8.gz %{_mandir}/man8/iscsistart.8.gz @@ -84,5 +84,5 @@ index e164c03..ce2198d 100644 %{_sbindir}/iscsiuio %{_unitdir}/iscsiuio.service -- -1.9.1 +2.7.4 diff --git a/filesystem/iscsi-initiator-utils/centos/meta_patches/0003-Add-iscsi-shutdown.service-patch.patch b/filesystem/iscsi-initiator-utils/centos/meta_patches/0003-Add-iscsi-shutdown.service-patch.patch index f7c2835bd..d074e6cbf 100644 --- a/filesystem/iscsi-initiator-utils/centos/meta_patches/0003-Add-iscsi-shutdown.service-patch.patch +++ b/filesystem/iscsi-initiator-utils/centos/meta_patches/0003-Add-iscsi-shutdown.service-patch.patch @@ -1,4 +1,4 @@ -From a6f22ef69ec794098fdd639f15a8266949de1499 Mon Sep 17 00:00:00 2001 +From 1a8a5cd52c489dc419653e24f9042f9dd87ce9bc Mon Sep 17 00:00:00 2001 From: Don Penney Date: Thu, 2 Nov 2017 11:03:43 -0400 Subject: [PATCH] Add iscsi-shutdown.service patch @@ -8,10 +8,10 @@ Subject: [PATCH] Add iscsi-shutdown.service patch 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SPECS/iscsi-initiator-utils.spec b/SPECS/iscsi-initiator-utils.spec -index 1457acb..0a95945 100644 +index 8865737..ce25ad4 100644 --- a/SPECS/iscsi-initiator-utils.spec +++ b/SPECS/iscsi-initiator-utils.spec -@@ -57,7 +57,8 @@ Patch198: keep-open-isns.patch +@@ -59,7 +59,8 @@ Patch198: keep-open-isns.patch Patch199: 0199-use-Red-Hat-version-string-to-match-RPM-package-vers.patch # WRS @@ -22,5 +22,5 @@ index 1457acb..0a95945 100644 BuildRequires: flex bison python-devel doxygen kmod-devel systemd-devel libmount-devel autoconf automake libtool # For dir ownership -- -1.8.3.1 +2.7.4