Accepting request 967364 from home:lee_duncan:branches:network

- Updated to latest upstream, including bug fixes and cleanups.
  Changes included:
  * add handling name/value pairs for firmware login (bsc#1196113),
    including man page update for same
  * Fix bug where some package parts were installed using
    DESTDIR twice
  * general build cleanup (in prep for removing DB files from
    /etc/iscsi some day soon)
  Also, now delivering a "package config" file for libopeniscsiusr.

OBS-URL: https://build.opensuse.org/request/show/967364
OBS-URL: https://build.opensuse.org/package/show/network/open-iscsi?expand=0&rev=195
This commit is contained in:
Lee Duncan 2022-04-06 17:42:11 +00:00 committed by Git OBS Bridge
parent 72e876a686
commit f0d47b9cfe
3 changed files with 19 additions and 7 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8a3f52b0cc98325520ef99903a0ba231b3e121ada9102df6f694bee4f188f3cd
size 16349
oid sha256:ffba1268e29251b8d354ba91530e0993d060f1340fbfc909185449fb299833d3
size 79808

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Wed Apr 6 17:02:04 UTC 2022 - Lee Duncan <lduncan@suse.com>
- Updated to latest upstream, including bug fixes and cleanups.
Changes included:
* add handling name/value pairs for firmware login (bsc#1196113),
including man page update for same
* Fix bug where some package parts were installed using
DESTDIR twice
* general build cleanup (in prep for removing DB files from
/etc/iscsi some day soon)
Also, now delivering a "package config" file for libopeniscsiusr.
-------------------------------------------------------------------
Sat Mar 5 17:23:19 UTC 2022 - Lee Duncan <lduncan@suse.com>

View File

@ -119,7 +119,7 @@ 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
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
@ -127,17 +127,15 @@ autoreconf --install
make %{?_smp_mflags} CFLAGS="%{optflags}" LIB_DIR=%{_libdir}
%install
make DESTDIR=%{buildroot} LIB_DIR=%{_libdir} sbindir=%{_sbindir} install_user
# install service files
make DESTDIR=%{buildroot} LIB_DIR=%{_libdir} sbindir=%{_sbindir} install_systemd
make DESTDIR=%{buildroot} LIB_DIR=%{_libdir} SBINDIR=%{_sbindir} RULESDIR=%{_udevrulesdir} install
# create rc symlinks
[ -d %{buildroot}%{_sbindir} ] || mkdir -p %{buildroot}%{_sbindir}
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
install -m 0755 usr/iscsistart %{buildroot}/%{_sbindir}
%make_install -C iscsiuio
# rename iscsiuio logrotate file to proper name
mv %{buildroot}%{_sysconfdir}/logrotate.d/iscsiuiolog %{buildroot}%{_sysconfdir}/logrotate.d/iscsiuio
@ -210,6 +208,7 @@ mv %{buildroot}%{_sysconfdir}/logrotate.d/iscsiuiolog %{buildroot}%{_sysconfdir}
%files -n libopeniscsiusr0_2_0
%{_libdir}/libopeniscsiusr.so.*
%{_libdir}/pkgconfig/*.pc
%files -n iscsiuio
%{_sbindir}/iscsiuio