Accepting request 352470 from home:lee_duncan
- Removing creation of the open-isns RPM, since it is now created in its own package OBS-URL: https://build.opensuse.org/request/show/352470 OBS-URL: https://build.opensuse.org/package/show/network/open-iscsi?expand=0&rev=60
This commit is contained in:
Lee Duncan
Git OBS Bridge
parent
8493452d39
commit
300cbfecf3
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1d4c5b843e1786b32830cb12bd6034fdb5915236dfc8ee1c2b4773eae436d3f5
|
||||
size 197332
|
||||
oid sha256:d574118eab6182e5ffac3b82035624343afa0ecc395e3083ed8517854090b1fa
|
||||
size 197303
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
## Name: iSNS iSCSI Name Server Daemon
|
||||
## Description: Opens ports for iSNS Name Server Daemon with broadcast allowed.
|
||||
|
||||
# space separated list of allowed TCP ports
|
||||
TCP="isns"
|
||||
|
||||
# space separated list of allowed UDP ports
|
||||
UDP="isns"
|
||||
|
||||
# space separated list of allowed RPC services
|
||||
RPC=""
|
||||
|
||||
# space separated list of allowed IP protocols
|
||||
IP=""
|
||||
|
||||
# space separated list of allowed UDP broadcast ports
|
||||
BROADCAST="isns"
|
||||
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 07 01:39:10 UTC 16 - lduncan@suse.com
|
||||
|
||||
- Removing creation of the open-isns RPM, since it
|
||||
is now created in its own package
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 18 17:29:56 UTC 2015 - lduncan@suse.com
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package open-iscsi
|
||||
#
|
||||
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -43,7 +43,6 @@ Summary: Linux* Open-iSCSI Software Initiator
|
||||
License: GPL-2.0+
|
||||
Group: Productivity/Networking/Other
|
||||
Source: %{name}-2.0-%{iscsi_release}.tar.bz2
|
||||
Source1: %{name}-firewall.service
|
||||
Patch1: %{name}-Factory-latest.diff.bz2
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
@ -66,19 +65,6 @@ processing, iSNS, SLP, Radius, etc.
|
||||
The user space Open-iSCSI consists of a daemon process called iscsid,
|
||||
and a management utility iscsiadm.
|
||||
|
||||
%package -n open-isns
|
||||
Summary: Linux iSNS server
|
||||
Group: Productivity/Networking/Other
|
||||
Version: 0.90
|
||||
Release: 0
|
||||
Obsoletes: isns <= 2.1.02
|
||||
Provides: isns = 2.1.03
|
||||
|
||||
%description -n open-isns
|
||||
This is a partial implementation of iSNS, according to RFC4171.
|
||||
The implementation is still somewhat incomplete, but I am releasing
|
||||
it for your reading pleasure.
|
||||
|
||||
%package -n iscsiuio
|
||||
Summary: Linux Broadcom NetXtremem II iscsi server
|
||||
Group: Productivity/Networking/Other
|
||||
@ -127,7 +113,6 @@ make DESTDIR=${RPM_BUILD_ROOT} install_service_suse
|
||||
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rciscsi
|
||||
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rciscsid
|
||||
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rciscsiuio
|
||||
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcisnsd
|
||||
%else
|
||||
make DESTDIR=${RPM_BUILD_ROOT} install_initd_suse
|
||||
# rename open-iscsi service to iscsid for openSUSE
|
||||
@ -142,13 +127,7 @@ ln -sf ../../etc/init.d/iscsid ${RPM_BUILD_ROOT}/usr/sbin/rciscsid
|
||||
(cd ${RPM_BUILD_ROOT}/etc; ln -sf iscsi/iscsid.conf iscsid.conf)
|
||||
touch ${RPM_BUILD_ROOT}/etc/iscsi/initiatorname.iscsi
|
||||
install -m 0755 usr/iscsistart %{buildroot}/sbin
|
||||
make DESTDIR=${RPM_BUILD_ROOT} -C utils/open-isns install
|
||||
%if 0%{?suse_version} >= 1230
|
||||
make DESTDIR=${RPM_BUILD_ROOT} -C utils/open-isns install_service
|
||||
%endif
|
||||
make DESTDIR=${RPM_BUILD_ROOT} -C iscsiuio install
|
||||
# install firewall file for isns server
|
||||
install -vD %{S:1} %{buildroot}/etc/sysconfig/SuSEfirewall2.d/services/isns
|
||||
|
||||
%post
|
||||
%if 0%{?suse_version} < 1320
|
||||
@ -192,28 +171,6 @@ fi
|
||||
%{stop_on_removal iscsid}
|
||||
%endif
|
||||
|
||||
%post -n open-isns
|
||||
%if 0%{?suse_version} >= 1230
|
||||
%{service_add_post isnsd.socket isnsd.service}
|
||||
%endif
|
||||
|
||||
%postun -n open-isns
|
||||
%if 0%{?suse_version} >= 1230
|
||||
%{service_del_postun isnsd.socket isnsd.service}
|
||||
%endif
|
||||
|
||||
%pre -n open-isns
|
||||
%if 0%{?suse_version} >= 1230
|
||||
%{service_add_pre isnsd.socket isnsd.service}
|
||||
%endif
|
||||
|
||||
%preun -n open-isns
|
||||
%if 0%{?suse_version} >= 1230
|
||||
%{service_del_preun isnsd.socket isnsd.service}
|
||||
%else
|
||||
%{stop_on_removal isnsd isnsdd}
|
||||
%endif
|
||||
|
||||
%post -n iscsiuio
|
||||
%if 0%{?suse_version} >= 1230
|
||||
%{service_add_post iscsiuio.socket iscsiuio.service}
|
||||
@ -276,25 +233,6 @@ fi
|
||||
%doc %{_mandir}/man8/iscsistart.8.gz
|
||||
%doc %{_mandir}/man8/iscsi-iname.8.gz
|
||||
|
||||
%files -n open-isns
|
||||
%defattr(-,root,root)
|
||||
%dir /etc/isns
|
||||
%attr(0600,root,root) %config(noreplace) /etc/isns/isnsd.conf
|
||||
%attr(0600,root,root) %config(noreplace) /etc/isns/isnsdd.conf
|
||||
%attr(0644,root,root) %config /etc/sysconfig/SuSEfirewall2.d/services/isns
|
||||
%if 0%{?suse_version} >= 1230
|
||||
%{_unitdir}/isnsd.service
|
||||
%{_unitdir}/isnsd.socket
|
||||
%{_sbindir}/rcisnsd
|
||||
%endif
|
||||
/usr/sbin/isnsd
|
||||
/usr/sbin/isnsdd
|
||||
/usr/sbin/isnsadm
|
||||
%doc %{_mandir}/man8/isnsadm.8.gz
|
||||
%doc %{_mandir}/man8/isnsd.8.gz
|
||||
%doc %{_mandir}/man8/isnsdd.8.gz
|
||||
%doc %{_mandir}/man5/isns_config.5.gz
|
||||
|
||||
%files -n iscsiuio
|
||||
%defattr(-,root,root)
|
||||
/sbin/iscsiuio
|
||||
|
||||
Loading…
Reference in New Issue
Block a user