89 lines
2.9 KiB
Diff
89 lines
2.9 KiB
Diff
From 70c42ca7d05032305e77b7ea10d003cac0b932ef Mon Sep 17 00:00:00 2001
|
|
From: Scott Little <scott.little@windriver.com>
|
|
Date: Mon, 2 Oct 2017 16:19:19 -0400
|
|
Subject: [PATCH 1/2] WRS: spec-include-TiS-changes.patch
|
|
|
|
---
|
|
SPECS/iscsi-initiator-utils.spec | 30 +++++++++++++++++++++---------
|
|
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
|
|
--- 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}.
|
|
Source4: 04-iscsi
|
|
Source5: iscsi-tmpfiles.conf
|
|
|
|
+# WRS
|
|
+Source6: iscsi-cache.volatiles
|
|
+
|
|
# 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
|
|
# version string, needs to be updated with each build
|
|
Patch199: 0199-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
|
|
|
|
+# WRS
|
|
+Patch200: increase-default-error-timeouts-for-iSCSI-initiator.patch
|
|
+
|
|
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
|
|
%{__install} -pm 755 libiscsi/build/lib.linux-*/libiscsimodule.so \
|
|
$RPM_BUILD_ROOT%{python_sitearch}
|
|
|
|
+# WRS
|
|
+%{__install} -D -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_tmpfilesdir}/iscsi-cache.conf
|
|
+
|
|
|
|
%post
|
|
/sbin/ldconfig
|
|
@@ -229,13 +238,13 @@ fi
|
|
|
|
%files
|
|
%doc README
|
|
-%dir %{_sharedstatedir}/iscsi
|
|
-%dir %{_sharedstatedir}/iscsi/nodes
|
|
-%dir %{_sharedstatedir}/iscsi/isns
|
|
-%dir %{_sharedstatedir}/iscsi/static
|
|
-%dir %{_sharedstatedir}/iscsi/slp
|
|
-%dir %{_sharedstatedir}/iscsi/ifaces
|
|
-%dir %{_sharedstatedir}/iscsi/send_targets
|
|
+%ghost %{_sharedstatedir}/iscsi
|
|
+%ghost %{_sharedstatedir}/iscsi/nodes
|
|
+%ghost %{_sharedstatedir}/iscsi/isns
|
|
+%ghost %{_sharedstatedir}/iscsi/static
|
|
+%ghost %{_sharedstatedir}/iscsi/slp
|
|
+%ghost %{_sharedstatedir}/iscsi/ifaces
|
|
+%ghost %{_sharedstatedir}/iscsi/send_targets
|
|
%ghost %{_var}/lock/iscsi
|
|
%ghost %{_var}/lock/iscsi/lock
|
|
%{_unitdir}/iscsi.service
|
|
@@ -245,8 +254,8 @@ fi
|
|
%{_libexecdir}/iscsi-mark-root-nodes
|
|
%{_sysconfdir}/NetworkManager/dispatcher.d/04-iscsi
|
|
%{_tmpfilesdir}/iscsi.conf
|
|
-%dir %{_sysconfdir}/iscsi
|
|
-%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/iscsi/iscsid.conf
|
|
+%attr(0750,root,root) %dir %{_sysconfdir}/iscsi
|
|
+%attr(0640,root,root) %config(noreplace) %{_sysconfdir}/iscsi/iscsid.conf
|
|
%{_sbindir}/iscsi-iname
|
|
%{_sbindir}/iscsiadm
|
|
%{_sbindir}/iscsid
|
|
@@ -258,6 +267,9 @@ fi
|
|
%{_mandir}/man8/iscsid.8.gz
|
|
%{_mandir}/man8/iscsistart.8.gz
|
|
|
|
+# WRS
|
|
+%{_tmpfilesdir}/iscsi-cache.conf
|
|
+
|
|
%files iscsiuio
|
|
%{_sbindir}/iscsiuio
|
|
%{_unitdir}/iscsiuio.service
|
|
--
|
|
1.9.1
|
|
|