[packages/open-iscsi] - don't change fc/rh patches, moved pld specific changes to build and systemd patches
baggins
baggins at pld-linux.org
Tue Apr 1 12:23:26 CEST 2014
commit 0db1e35ba9ee90b64b1045aa3337f4af62f95832
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Tue Apr 1 12:22:36 2014 +0200
- don't change fc/rh patches, moved pld specific changes to build and systemd patches
0050-iscsi-boot-related-service-file-updates.patch | 11 +++---
0065-fix-hardened-build-of-iscsiuio.patch | 3 +-
open-iscsi-build.patch | 11 ++++++
open-iscsi-systemd.patch | 42 ++++++++++++++++++++++
open-iscsi.spec | 8 +++--
5 files changed, 66 insertions(+), 9 deletions(-)
---
diff --git a/open-iscsi.spec b/open-iscsi.spec
index def249a..df9d979 100644
--- a/open-iscsi.spec
+++ b/open-iscsi.spec
@@ -16,8 +16,9 @@ Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: %{name}-devices.init
Source4: iscsiuio.logrotate
-Patch0: %{name}-build.patch
-Patch1: %{name}-git.patch
+Patch0: %{name}-git.patch
+Patch1: %{name}-build.patch
+Patch2: %{name}-systemd.patch
Patch31: 0043-idmb_rec_write-check-for-tpgt-first.patch
Patch32: 0044-iscsid-add-initrd-option-to-set-run-from-initrd-hint.patch
Patch33: 0045-idbm_rec_write-seperate-old-and-new-style-writes.patch
@@ -75,7 +76,6 @@ informacji o protokole iSCSI znajduje się w standardach IETF na
%prep
%setup -q -n %{name}-%{ver}-%{subver}
%patch0 -p1
-%patch1 -p1
%patch31 -p1
%patch32 -p1
%patch33 -p1
@@ -91,6 +91,8 @@ informacji o protokole iSCSI znajduje się w standardach IETF na
%patch43 -p1
%patch44 -p1
%patch45 -p1
+%patch1 -p1
+%patch2 -p1
%if %{with dynamic}
sed -i -e 's/-static //' usr/Makefile
diff --git a/0050-iscsi-boot-related-service-file-updates.patch b/0050-iscsi-boot-related-service-file-updates.patch
index f670072..19450ee 100644
--- a/0050-iscsi-boot-related-service-file-updates.patch
+++ b/0050-iscsi-boot-related-service-file-updates.patch
@@ -19,19 +19,20 @@ new file mode 100644
index 0000000..157be62
--- /dev/null
+++ b/etc/systemd/iscsi-mark-root-nodes
-@@ -0,0 +1,12 @@
-+#!/bin/sh
+@@ -0,0 +1,13 @@
++#!/bin/bash
+
+ISCSIADM=/sbin/iscsiadm
+
+$ISCSIADM -m session >/dev/null 2>&1 || exit 0
+
+$ISCSIADM -m session | while read t num i target; do
-+ ip=${i%:*}
-+ $ISCSIADM -m node -p $ip -T $target -o update -n node.startup -v onboot
++ ip=${i%:*}
++ $ISCSIADM -m node -p $ip -T $target -o update -n node.startup -v onboot
+done
+
+systemctl start iscsid.service
++
diff --git a/etc/systemd/iscsi.service b/etc/systemd/iscsi.service
index 7b4efee..d5712bd 100644
--- a/etc/systemd/iscsi.service
@@ -41,7 +42,7 @@ index 7b4efee..d5712bd 100644
Type=oneshot
RemainAfterExit=true
-ExecStart=/usr/libexec/iscsi_mark_root_nodes
-+ExecStart=/lib/systemd/pld-helpers.d/iscsi-mark-root-nodes
++ExecStart=/usr/libexec/iscsi-mark-root-nodes
ExecStart=/sbin/iscsiadm -m node --loginall=automatic
ExecStop=/bin/sync
ExecStop=/sbin/iscsiadm -m node --logoutall=automatic
diff --git a/0065-fix-hardened-build-of-iscsiuio.patch b/0065-fix-hardened-build-of-iscsiuio.patch
index 83210c6..bcc43a4 100644
--- a/0065-fix-hardened-build-of-iscsiuio.patch
+++ b/0065-fix-hardened-build-of-iscsiuio.patch
@@ -17,11 +17,12 @@ diff --git a/iscsiuio/configure.ac b/iscsiuio/configure.ac
index e9a5e32..d9a6bdb 100644
--- a/iscsiuio/configure.ac
+++ b/iscsiuio/configure.ac
-@@ -52,7 +52,6 @@ AC_LIBTOOL_DLOPEN
+@@ -52,7 +52,7 @@ AC_LIBTOOL_DLOPEN
# libtool stuff
AC_PROG_LIBTOOL
-CFLAGS="-O2 -Wall"
++CFLAGS="${CFLAGS} -O2 -Wall"
## check for --enable-debug first before checking CFLAGS before
## so that we don't mix -O and -g
AC_ARG_ENABLE(debug,
diff --git a/open-iscsi-build.patch b/open-iscsi-build.patch
index c044a81..c9d63a2 100644
--- a/open-iscsi-build.patch
+++ b/open-iscsi-build.patch
@@ -17,3 +17,14 @@
+ $(CC) $(CFLAGS) -static $^ -o $@ -lslp
clean:
rm -f *.o $(PROGRAMS) .depend $(LIBSYS)
+--- a/iscsiuio/configure.ac
++++ b/iscsiuio/configure.ac
+@@ -52,7 +52,7 @@ AC_LIBTOOL_DLOPEN
+ # libtool stuff
+ AC_PROG_LIBTOOL
+
+-CFLAGS="${CFLAGS} -O2 -Wall"
++CFLAGS="${CFLAGS} -Wall"
+ ## check for --enable-debug first before checking CFLAGS before
+ ## so that we don't mix -O and -g
+ AC_ARG_ENABLE(debug,
diff --git a/open-iscsi-systemd.patch b/open-iscsi-systemd.patch
new file mode 100644
index 0000000..504293a
--- /dev/null
+++ b/open-iscsi-systemd.patch
@@ -0,0 +1,42 @@
+--- open-iscsi-2.0-873/etc/systemd/iscsi-mark-root-nodes~ 2014-04-01 12:17:50.000000000 +0200
++++ open-iscsi-2.0-873/etc/systemd/iscsi-mark-root-nodes 2014-04-01 12:19:04.118355255 +0200
+@@ -1,13 +1,12 @@
+-#!/bin/bash
++#!/bin/sh
+
+ ISCSIADM=/sbin/iscsiadm
+
+ $ISCSIADM -m session >/dev/null 2>&1 || exit 0
+
+ $ISCSIADM -m session | while read t num i target; do
+- ip=${i%:*}
+- $ISCSIADM -m node -p $ip -T $target -o update -n node.startup -v onboot
++ ip=${i%:*}
++ $ISCSIADM -m node -p $ip -T $target -o update -n node.startup -v onboot
+ done
+
+-systemctl start iscsid.service
+-
++/bin/systemctl start iscsid.service
+--- open-iscsi-2.0-873/etc/systemd/iscsi.service~ 2014-04-01 12:17:50.000000000 +0200
++++ open-iscsi-2.0-873/etc/systemd/iscsi.service 2014-04-01 12:19:26.975255123 +0200
+@@ -10,7 +10,7 @@
+ [Service]
+ Type=oneshot
+ RemainAfterExit=true
+-ExecStart=/usr/libexec/iscsi-mark-root-nodes
++ExecStart=/lib/systemd/pld-helpers.d/iscsi-mark-root-nodes
+ ExecStart=/sbin/iscsiadm -m node --loginall=automatic
+ ExecStop=/bin/sync
+ ExecStop=/sbin/iscsiadm -m node --logoutall=automatic
+--- open-iscsi-2.0-873/etc/systemd/iscsid.service~ 2014-04-01 12:17:50.000000000 +0200
++++ open-iscsi-2.0-873/etc/systemd/iscsid.service 2014-04-01 12:20:05.375647813 +0200
+@@ -9,7 +9,7 @@
+ [Service]
+ Type=forking
+ PIDFile=/var/run/iscsid.pid
+-ExecStart=/usr/sbin/iscsid
++ExecStart=/usr/sbin/iscsid -u iscsi -g iscsi
+ ExecStop=/sbin/iscsiadm -k 0 2
+
+ [Install]
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/open-iscsi.git/commitdiff/0db1e35ba9ee90b64b1045aa3337f4af62f95832
More information about the pld-cvs-commit
mailing list