Author: arekm Date: Fri Feb 8 10:02:45 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- up to 865.15; drop kernel module (it's already in upstream kernel)
---- Files affected:
SPECS:
open-iscsi.spec (1.8 -> 1.9)
---- Diffs:
================================================================
Index: SPECS/open-iscsi.spec
diff -u SPECS/open-iscsi.spec:1.8 SPECS/open-iscsi.spec:1.9
--- SPECS/open-iscsi.spec:1.8 Thu Apr 19 02:28:06 2007
+++ SPECS/open-iscsi.spec Fri Feb 8 11:02:40 2008
@@ -1,34 +1,25 @@
# $Revision$, $Date$
-#
-# Conditional build:
-%bcond_without dist_kernel # allow non-distribution kernel
-%bcond_without kernel # don't build kernel modules
-%bcond_without userspace # don't build userspace module
-%bcond_with verbose # verbose build (V=1)
-#
-%define _rc -754
-%define _rel 0.1
+%define _rc 865.15
+%define _rel 1
Summary: iSCSI - SCSI over IP
Summary(pl.UTF-8): iSCSI - SCSI po IP
Name: open-iscsi
Version: 2.0
-Release: %{_rel}
+Release: 0.%{_rc}.%{_rel}
License: GPL
-Group: Base/Kernel
-Source0: http://www.open-iscsi.org/bits/%{name}-%{version}%{_rc}.tar.gz
-# Source0-md5: 2e7ce941ea4e4eda7c82f0b272a33bf9
+Group: Networking/Daemons
+Source0: http://www.open-iscsi.org/bits/%{name}-%{version}-%{_rc}.tar.gz
+# Source0-md5: 2efff8c813ec84677a80c3e881942ffc
Source1: %{name}.init
Source2: %{name}.sysconfig
URL: http://www.open-iscsi.org/
BuildRequires: db-devel
-%{?with_dist_kernel:BuildRequires: kernel-headers >= 2.6.20.2}
BuildRequires: rpmbuild(macros) >= 1.379
Requires(post,preun): /sbin/chkconfig
Requires: rc-scripts
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _sbindir /sbin
-%define _moddir kernel/2.6.20
%description
The Linux iSCSI driver acts as an iSCSI protocol initiator to
@@ -46,50 +37,20 @@
informacji o protokole iSCSI znajduje się w standardach IETF na
<http://www.ietf.org/>.
-%package -n kernel-iscsi
-Summary: ISCSI kernel module
-Summary(pl.UTF-8): Moduł jądra ISCSI
-Release: [EMAIL PROTECTED]
-Group: Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel}
-
-%description -n kernel-iscsi
-IP over SCSI kernel module.
-
-%description -n kernel-iscsi -l pl.UTF-8
-Moduł jądra dla protokołu IP over SCSI.
-
%prep
-%setup -q -n %{name}-%{version}%{_rc}
-
-cat > %{_moddir}/Makefile << EOF
-EXTRA_CFLAGS += -I%{_moddir} -I$PWD/include
-
-obj-m += scsi_transport_iscsi.o
-obj-m += libiscsi.o
-obj-m += iscsi_tcp.o
-EOF
+%setup -q -n %{name}-%{version}-%{_rc}
%build
-%if %{with kernel}
-%build_kernel_modules -C %{_moddir} -m scsi_transport_iscsi,libiscsi,iscsi_tcp
-%endif
-
-%if %{with userspace}
-%{__make} -C usr \
- CC="%{__cc}" \
- CFLAGS="%{rpmcflags} -I../include -DLinux -DNETLINK_ISCSI=12
-D_GNU_SOURCE"
-%endif
+for i in usr utils utils/fwparam_ibft; do
+ %{__make} -C $i \
+ CC="%{__cc}" \
+ CFLAGS="%{rpmcflags} -I../include -DLinux -DNETLINK_ISCSI=12
-D_GNU_SOURCE"
+done
%install
rm -rf $RPM_BUILD_ROOT
install -d
$RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man{1,5,8},/etc/{rc.d/init.d,sysconfig}}
-%if %{with kernel}
-%install_kernel_modules -m
%{_moddir}/{iscsi_tcp,libiscsi,scsi_transport_iscsi} -d misc
-%endif
-
-%if %{with userspace}
install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/iscsi
install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/iscsi
@@ -97,18 +58,12 @@
install etc/iscsid.conf $RPM_BUILD_ROOT%{_sysconfdir}
-install usr/iscsid usr/iscsiadm $RPM_BUILD_ROOT%{_sbindir}
-%endif
+install usr/{iscsid,iscsiadm,iscsistart} utils/iscsi-iname
$RPM_BUILD_ROOT%{_sbindir}
+install utils/fwparam_ibft/fwparam_ibft $RPM_BUILD_ROOT%{_sbindir}
%clean
rm -rf $RPM_BUILD_ROOT
-%post -n kernel-iscsi
-%depmod %{_kernel_ver}
-
-%postun -n kernel-iscsi
-%depmod %{_kernel_ver}
-
%post
if ! grep -q "^InitiatorName=[^ \t\n]" %{_sysconfdir}/initiatorname.iscsi
2>/dev/null ; then
echo "InitiatorName=$(hostname -f)" >>
%{_sysconfdir}/initiatorname.iscsi
@@ -123,7 +78,6 @@
/sbin/chkconfig --del iscsi
fi
-%if %{with userspace}
%files
%defattr(644,root,root,755)
%doc README THANKS
@@ -132,13 +86,6 @@
%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/initiatorname.iscsi
%attr(754,root,root) /etc/rc.d/init.d/iscsi
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
/etc/sysconfig/iscsi
-%endif
-
-%if %{with kernel}
-%files -n kernel-iscsi
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}/misc/*
-%endif
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -146,6 +93,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.9 2008-02-08 10:02:40 arekm
+- up to 865.15; drop kernel module (it's already in upstream kernel)
+
Revision 1.8 2007-04-19 00:28:06 zbyniu
- up to 2.0-754; new style kernel module build macros
- removed up, smp bcond and smp package
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/open-iscsi.spec?r1=1.8&r2=1.9&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
