From cafe17aa92bcfe6fbefb35198a8d884ba9947c2d7cac60ccfc809dee7cb7dee8 Mon Sep 17 00:00:00 2001 From: Lee Duncan Date: Wed, 28 Sep 2022 19:22:44 +0000 Subject: [PATCH 1/3] Accepting request 1006753 from home:lee_duncan - Update to upstream version 2.1.8, which includes some bug fixes, and adds the ability to build using meson. The SPEC file was updated to use meson. Also, some files have moved: * the "lock" file has moved from /etc/iscsi to /var/lock/iscsi * the "database files" have moved from /etc/iscsi to /var/lib/iscsi OBS-URL: https://build.opensuse.org/request/show/1006753 OBS-URL: https://build.opensuse.org/package/show/network/open-iscsi?expand=0&rev=209 --- open-iscsi-2.1.7-suse.tar.bz2 | 3 -- open-iscsi-2.1.8-suse.tar.bz2 | 3 ++ open-iscsi-SUSE-latest.diff.bz2 | 4 +-- open-iscsi.changes | 12 +++++++ open-iscsi.spec | 57 ++++++++++++++++++++------------- 5 files changed, 51 insertions(+), 28 deletions(-) delete mode 100644 open-iscsi-2.1.7-suse.tar.bz2 create mode 100644 open-iscsi-2.1.8-suse.tar.bz2 diff --git a/open-iscsi-2.1.7-suse.tar.bz2 b/open-iscsi-2.1.7-suse.tar.bz2 deleted file mode 100644 index 5851eb1..0000000 --- a/open-iscsi-2.1.7-suse.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b97e92ccbd5ab77f57b1fc0a3fe395c9e67a36cf06e8104ca1e205e7d04da840 -size 499258 diff --git a/open-iscsi-2.1.8-suse.tar.bz2 b/open-iscsi-2.1.8-suse.tar.bz2 new file mode 100644 index 0000000..b16639b --- /dev/null +++ b/open-iscsi-2.1.8-suse.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ec13f45bbaba494c940f868798cda35e49aa747747c169a7348ac61d472f2b7 +size 509310 diff --git a/open-iscsi-SUSE-latest.diff.bz2 b/open-iscsi-SUSE-latest.diff.bz2 index 06b00e5..1f82a91 100644 --- a/open-iscsi-SUSE-latest.diff.bz2 +++ b/open-iscsi-SUSE-latest.diff.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aaf13d07897f593ef9abb722dd407e450dae456256215fba67a9586ab090eff0 -size 2298 +oid sha256:d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 +size 14 diff --git a/open-iscsi.changes b/open-iscsi.changes index e5c4687..e8a5a0c 100644 --- a/open-iscsi.changes +++ b/open-iscsi.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Sep 26 21:15:57 UTC 2022 - Lee Duncan + +- Update to upstream version 2.1.8, which includes some bug fixes, + and adds the ability to build using meson. The SPEC file was + updated to use meson. + + Also, some files have moved: + * the "lock" file has moved from /etc/iscsi to /var/lock/iscsi + * the "database files" have moved from /etc/iscsi to + /var/lib/iscsi + ------------------------------------------------------------------- Wed Jul 6 20:13:21 UTC 2022 - Lee Duncan diff --git a/open-iscsi.spec b/open-iscsi.spec index dd5abc2..c36ccfb 100644 --- a/open-iscsi.spec +++ b/open-iscsi.spec @@ -16,16 +16,25 @@ # -# ensure usr-merge does not effect existing SLE +# ensure usr-merge does not effect existing SLE, +# and move DB root to /var/lib/iscsi for Factory %if ! 0%{?is_opensuse} +# sle %define _sbindir /sbin +%define _dbroot %{_sysconfdir}/iscsi +%define _lockdir %{_sysconfdir}/iscsi +%else +# opensuse +%define _sbindir /usr/sbin +%define _dbroot %{_sharedstatedir}/iscsi +%define _lockdir %{_rundir}/lock/iscsi %endif %define iscsi_minor_release 1 -%define iscsi_patch_release 7 +%define iscsi_patch_release 8 %define iscsi_patch_release_suse %{iscsi_patch_release}-suse Name: open-iscsi -Version: 2.1.7 +Version: 2.1.8 Release: 0 Summary: Linux iSCSI Software Initiator License: GPL-2.0-or-later @@ -33,8 +42,6 @@ Group: Productivity/Networking/Other URL: https://www.open-iscsi.com Source: %{name}-2.%{iscsi_minor_release}.%{iscsi_patch_release_suse}.tar.bz2 Patch1: %{name}-SUSE-latest.diff.bz2 -BuildRequires: autoconf -BuildRequires: automake BuildRequires: bison BuildRequires: db-devel < 5 BuildRequires: fdupes @@ -42,9 +49,10 @@ BuildRequires: flex BuildRequires: libkmod-devel BuildRequires: libmount-devel BuildRequires: libtool -BuildRequires: make +BuildRequires: meson >= 0.54.0 BuildRequires: open-isns-devel BuildRequires: openssl-devel >= 1.1.1c +BuildRequires: perl BuildRequires: pkg-config BuildRequires: suse-module-tools BuildRequires: pkgconfig(libsystemd) @@ -106,6 +114,7 @@ Release: 0 Summary: The iSCSI User-level Library Development Library and Include files Group: Development/Libraries/C and C++ Requires: %{name} = %{version} +Requires: libopeniscsiusr0_2_0 = %{version} Conflicts: libopeniscsiusr0_1_0 %description devel @@ -119,24 +128,25 @@ the libopeniscsiusr library. %build [ -z "$SOURCE_DATE_EPOCH" ] || export KBUILD_BUILD_TIMESTAMP=@$SOURCE_DATE_EPOCH -make %{?_smp_mflags} OPTFLAGS="%{optflags} -fno-strict-aliasing -fno-common -DOFFLOAD_BOOT_SUPPORTED -DLOCK_DIR=\\\"%{_sysconfdir}/iscsi\\\"" LIB_DIR=%{_libdir} SBINDIR=%{_sbindir} user -cd iscsiuio -touch AUTHORS NEWS -autoreconf --install -%configure --sbindir=%{_sbindir} -make %{?_smp_mflags} CFLAGS="%{optflags}" LIB_DIR=%{_libdir} +%meson -Dc_flags="%{optflags} -fno-strict-aliasing -fno-common -DOFFLOAD_BOOT_SUPPORTED" \ + --libdir=%{_libdir} \ + -Discsi_sbindir=%{_sbindir} -Ddbroot=%{_dbroot} -Drulesdir=%{_udevrulesdir} -Dlockdir=%{_lockdir} \ + --strip +%meson_build %install -make DESTDIR=%{buildroot} LIB_DIR=%{_libdir} SBINDIR=%{_sbindir} RULESDIR=%{_udevrulesdir} install -# create rc symlinks +%meson_install [ -d %{buildroot}%{_sbindir} ] || mkdir -p %{buildroot}%{_sbindir} +# create brcm_iscsiuio symlink if needed +[ -e %{buildroot}%{_sbindir}/brcm_iscsiuio ] || \ + ln -s %{_sbindir}/iscsiuio %{buildroot}%{_sbindir}/brcm_iscsiuio +# create rc symlinks ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rciscsi ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rciscsid ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rciscsiuio (cd %{buildroot}/etc; ln -sf iscsi/iscsid.conf iscsid.conf) # create an empty initiatorname file, as a package place holder echo > %{buildroot}%{_sysconfdir}/iscsi/initiatorname.iscsi -%make_install -C iscsiuio # rename iscsiuio logrotate file to proper name %if 0%{?suse_version} > 1500 mkdir -p %{buildroot}%{_distconfdir}/logrotate.d @@ -151,20 +161,20 @@ mv %{buildroot}%{_sysconfdir}/logrotate.d/iscsiuiolog %{buildroot}%{_sysconfdir} if [ ! -f %{_sysconfdir}/iscsi/initiatorname.iscsi ] ; then %{_sbindir}/iscsi-gen-initiatorname fi -%service_add_post iscsi.service iscsid.service iscsid.socket +%service_add_post iscsi.service iscsid.service iscsid.socket iscsi-init.service %posttrans %{?regenerate_initrd_posttrans} %postun %service_del_postun_without_restart iscsi.service -%service_del_postun iscsid.service iscsid.socket +%service_del_postun iscsi.service iscsid.service iscsid.socket iscsi-init.service %pre -%service_add_pre iscsi.service iscsid.service iscsid.socket +%service_add_pre iscsi.service iscsid.service iscsid.socket iscsi-init.service %preun -%service_del_preun iscsi.service iscsid.service iscsid.socket +%service_del_preun iscsi.service iscsid.service iscsid.socket iscsi-init.service %post -n libopeniscsiusr0_2_0 -p %{run_ldconfig} %postun -n libopeniscsiusr0_2_0 -p %{run_ldconfig} @@ -183,11 +193,12 @@ fi %files %dir %{_sysconfdir}/iscsi +%{_sysconfdir}/iscsid.conf %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/iscsi/iscsid.conf %ghost %{_sysconfdir}/iscsi/initiatorname.iscsi -%dir %{_sysconfdir}/iscsi/ifaces -%config %{_sysconfdir}/iscsi/ifaces/iface.example -%{_sysconfdir}/iscsid.conf +%dir %{_dbroot} +%dir %{_dbroot}/ifaces +%{_dbroot}/ifaces/iface.example %attr(0644,root,root) %{_unitdir}/iscsid.service %attr(0644,root,root) %{_unitdir}/iscsid.socket %attr(0644,root,root) %{_unitdir}/iscsi-init.service @@ -216,7 +227,6 @@ fi %files -n libopeniscsiusr0_2_0 %{_libdir}/libopeniscsiusr.so.* -%{_libdir}/pkgconfig/*.pc %files -n iscsiuio %{_sbindir}/iscsiuio @@ -236,5 +246,6 @@ fi %{_includedir}/libopeniscsiusr*.h %{_mandir}/man3/*.3%{ext_man} %{_libdir}/libopeniscsiusr.so +%{_libdir}/pkgconfig/*.pc %changelog From c92454dcc783a4d59314fcdedff880e26c0150a9765ebfe8b5dbd7d4a397b8ec Mon Sep 17 00:00:00 2001 From: Lee Duncan Date: Wed, 28 Sep 2022 20:52:50 +0000 Subject: [PATCH 2/3] Accepting request 1006774 from home:lee_duncan try 2 OBS-URL: https://build.opensuse.org/request/show/1006774 OBS-URL: https://build.opensuse.org/package/show/network/open-iscsi?expand=0&rev=210 --- open-iscsi.spec | 52 +++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/open-iscsi.spec b/open-iscsi.spec index c36ccfb..6b7391a 100644 --- a/open-iscsi.spec +++ b/open-iscsi.spec @@ -20,12 +20,12 @@ # and move DB root to /var/lib/iscsi for Factory %if ! 0%{?is_opensuse} # sle -%define _sbindir /sbin +%define _iscsi_sbindir /sbin %define _dbroot %{_sysconfdir}/iscsi %define _lockdir %{_sysconfdir}/iscsi %else # opensuse -%define _sbindir /usr/sbin +%define _iscsi_sbindir /usr/sbin %define _dbroot %{_sharedstatedir}/iscsi %define _lockdir %{_rundir}/lock/iscsi %endif @@ -128,22 +128,23 @@ the libopeniscsiusr library. %build [ -z "$SOURCE_DATE_EPOCH" ] || export KBUILD_BUILD_TIMESTAMP=@$SOURCE_DATE_EPOCH -%meson -Dc_flags="%{optflags} -fno-strict-aliasing -fno-common -DOFFLOAD_BOOT_SUPPORTED" \ - --libdir=%{_libdir} \ - -Discsi_sbindir=%{_sbindir} -Ddbroot=%{_dbroot} -Drulesdir=%{_udevrulesdir} -Dlockdir=%{_lockdir} \ +%meson --libdir=%{_libdir} \ + -Dc_flags="%{optflags} -fno-strict-aliasing -fno-common -DOFFLOAD_BOOT_SUPPORTED" \ + -Discsi_sbindir=%{_iscsi_sbindir} -Ddbroot=%{_dbroot} -Drulesdir=%{_udevrulesdir} -Dlockdir=%{_lockdir} \ --strip %meson_build %install %meson_install -[ -d %{buildroot}%{_sbindir} ] || mkdir -p %{buildroot}%{_sbindir} +[ -d %{buildroot}%{_iscsi_sbindir} ] || mkdir -p %{buildroot}%{_iscsi_sbindir} # create brcm_iscsiuio symlink if needed -[ -e %{buildroot}%{_sbindir}/brcm_iscsiuio ] || \ - ln -s %{_sbindir}/iscsiuio %{buildroot}%{_sbindir}/brcm_iscsiuio +[ -e %{buildroot}%{_iscsi_sbindir}/brcm_iscsiuio ] || \ + ln -s %{_iscsi_sbindir}/iscsiuio %{buildroot}%{_iscsi_sbindir}/brcm_iscsiuio # create rc symlinks -ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rciscsi -ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rciscsid -ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rciscsiuio +ln -s %{_iscsi_sbindir}/service %{buildroot}%{_iscsi_sbindir}/rciscsi +ln -s %{_iscsi_sbindir}/service %{buildroot}%{_iscsi_sbindir}/rciscsid +ln -s %{_iscsi_sbindir}/service %{buildroot}%{_iscsi_sbindir}/rciscsiuio +ln -s %{_iscsi_sbindir}/service %{buildroot}%{_iscsi_sbindir}/rciscsi-init (cd %{buildroot}/etc; ln -sf iscsi/iscsid.conf iscsid.conf) # create an empty initiatorname file, as a package place holder echo > %{buildroot}%{_sysconfdir}/iscsi/initiatorname.iscsi @@ -159,7 +160,7 @@ mv %{buildroot}%{_sysconfdir}/logrotate.d/iscsiuiolog %{buildroot}%{_sysconfdir} %post %{?regenerate_initrd_post} if [ ! -f %{_sysconfdir}/iscsi/initiatorname.iscsi ] ; then - %{_sbindir}/iscsi-gen-initiatorname + %{_iscsi_sbindir}/iscsi-gen-initiatorname fi %service_add_post iscsi.service iscsid.service iscsid.socket iscsi-init.service @@ -204,16 +205,17 @@ fi %attr(0644,root,root) %{_unitdir}/iscsi-init.service %attr(0644,root,root) %{_unitdir}/iscsi.service %{_systemdgeneratordir}/ibft-rule-generator -%{_sbindir}/rciscsi -%{_sbindir}/rciscsid -%{_sbindir}/iscsid -%{_sbindir}/iscsiadm -%{_sbindir}/iscsi-iname -%{_sbindir}/iscsistart -%{_sbindir}/iscsi-gen-initiatorname -%{_sbindir}/iscsi_offload -%{_sbindir}/iscsi_discovery -%{_sbindir}/iscsi_fw_login +%{_iscsi_sbindir}/rciscsi +%{_iscsi_sbindir}/rciscsid +%{_iscsi_sbindir}/rciscsi-init +%{_iscsi_sbindir}/iscsid +%{_iscsi_sbindir}/iscsiadm +%{_iscsi_sbindir}/iscsi-iname +%{_iscsi_sbindir}/iscsistart +%{_iscsi_sbindir}/iscsi-gen-initiatorname +%{_iscsi_sbindir}/iscsi_offload +%{_iscsi_sbindir}/iscsi_discovery +%{_iscsi_sbindir}/iscsi_fw_login %doc README %license COPYING %{_mandir}/man8/iscsiadm.8%{ext_man} @@ -229,8 +231,8 @@ fi %{_libdir}/libopeniscsiusr.so.* %files -n iscsiuio -%{_sbindir}/iscsiuio -%{_sbindir}/brcm_iscsiuio +%{_iscsi_sbindir}/iscsiuio +%{_iscsi_sbindir}/brcm_iscsiuio %{_mandir}/man8/iscsiuio.8%{ext_man} %if 0%{?suse_version} > 1500 %dir %{_distconfdir}/logrotate.d @@ -240,7 +242,7 @@ fi %endif %attr(0644,root,root) %{_unitdir}/iscsiuio.service %attr(0644,root,root) %{_unitdir}/iscsiuio.socket -%{_sbindir}/rciscsiuio +%{_iscsi_sbindir}/rciscsiuio %files devel %{_includedir}/libopeniscsiusr*.h From 6321a73076d04a76cf7ccf6f3c9081bae8900de40507661a5aae058a3bb9a0e4 Mon Sep 17 00:00:00 2001 From: Lee Duncan Date: Wed, 28 Sep 2022 21:59:18 +0000 Subject: [PATCH 3/3] Accepting request 1006787 from home:lee_duncan Updated submission Version 2.1.8 for SUSE. OBS-URL: https://build.opensuse.org/request/show/1006787 OBS-URL: https://build.opensuse.org/package/show/network/open-iscsi?expand=0&rev=211 --- open-iscsi.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/open-iscsi.spec b/open-iscsi.spec index 6b7391a..bb72eaa 100644 --- a/open-iscsi.spec +++ b/open-iscsi.spec @@ -16,8 +16,10 @@ # -# ensure usr-merge does not effect existing SLE, -# and move DB root to /var/lib/iscsi for Factory +# Ensure usr-merge does not effect existing SLE. Cannot use _sbindir +# directly since meson macros pass that on, and meson does not like +# setting it to "/sbin". Also and move DB root to /var/lib/iscsi and +# lockdir to /run/lock/iscsi for Factory but not SLE (yet) %if ! 0%{?is_opensuse} # sle %define _iscsi_sbindir /sbin