SPECS: linux-iscsi.spec - 4.0 series back on head

arekm arekm at pld-linux.org
Wed Jul 6 13:27:21 CEST 2005


Author: arekm                        Date: Wed Jul  6 11:27:21 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 4.0 series back on head

---- Files affected:
SPECS:
   linux-iscsi.spec (1.30 -> 1.31) 

---- Diffs:

================================================================
Index: SPECS/linux-iscsi.spec
diff -u SPECS/linux-iscsi.spec:1.30 SPECS/linux-iscsi.spec:1.31
--- SPECS/linux-iscsi.spec:1.30	Wed Jun 22 18:36:10 2005
+++ SPECS/linux-iscsi.spec	Wed Jul  6 13:27:16 2005
@@ -10,19 +10,19 @@
 Summary:	iSCSI - SCSI over IP
 Summary(pl):	iSCSI - SCSI po IP
 Name:		linux-iscsi
-Version:	5.0.0.0.3
-%define		_rc  rc6-363
-%define		_rel 1
+Version:	4.0.2
+%define		_rel 0.1
 Release:	%{_rel}
 License:	GPL
 Group:		Base/Kernel
-Source0:	http://dl.sourceforge.net/linux-iscsi/%{name}-%{version}%{_rc}.tar.gz
-# Source0-md5:	3df59acaf3e9d3011e417873417eb0bf
+Source0:	http://dl.sourceforge.net/linux-iscsi/%{name}-%{version}.tgz
+# Source0-md5:	da77c95464a57abe2cdd8d00323bb477
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
+Patch0:		%{name}-sysfs.patch
 URL:		http://linux-iscsi.sourceforge.net/
 %{?with_dist_kernel:BuildRequires:	kernel-headers >= 2.6.0}
-BuildRequires:	db-devel
+BuildRequires:	sysfsutils-static
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sbindir	/sbin
@@ -48,7 +48,7 @@
 Summary(pl):	Moduł jądra ISCSI
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
-Requires:	%{name} = %{version}-%{_rel}
+Requires:	%{name} = %{version}-%{release}
 
 %description -n kernel-iscsi
 IP over SCSI kernel module.
@@ -61,7 +61,7 @@
 Summary(pl):	Moduł jądra SMP ISCSI
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
-Requires:	%{name} = %{version}-%{_rel}
+Requires:	%{name} = %{version}-%{release}
 
 %description -n kernel-smp-iscsi
 IP over SCSI SMP kernel module.
@@ -70,13 +70,14 @@
 Moduł jądra SMP dla protokołu IP over SCSI.
 
 %prep
-%setup -q -n %{name}-%{version}%{_rc}
+%setup -q
+%patch0 -p1
 
 %build
 %if %{with kernel}
-cd kernel
-patch < backward-compile-2.6.11.patch
-
+sed -i -e "s#\$(pwd)#$(pwd)#g" -e "s#driver/include#driver/include-iscsi#g" driver/Makefile
+cd driver
+mv include include-iscsi
 # kernel module(s)
 for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
 	if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
@@ -97,35 +98,28 @@
 		CC="%{__cc}" \
 		M=$PWD O=$PWD \
 		%{?with_verbose:V=1}
-	mv iscsi_tcp{,-$cfg}.ko
-	mv scsi_transport_iscsi{,-$cfg}.ko
+	mv iscsi_sfnet{,-$cfg}.ko
 done
 cd ..
 %endif
 
 %if %{with userspace}
-%{__make} -C usr \
-	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags} -I../include -DLinux -DNETLINK_ISCSI=10"
+%{__make} user \
+	CC="%{__cc}"
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man{1,5,8},/etc/{rc.d/init.d,sysconfig}}
+install -d $RPM_BUILD_ROOT/var/lib/iscsi
 
 %if %{with kernel}
 install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
-
-install kernel/iscsi_tcp-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/iscsi_tcp.ko
-install kernel/scsi_transport_iscsi-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-        $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/scsi_transport_iscsi.ko
-
+install iscsi_sfnet-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
+	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/iscsi_sfnet.ko
 %if %{with smp} && %{with dist_kernel}
-install kernel/iscsi_tcp-smp.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/iscsi_tcp.ko
-install kernel/scsi_transport_iscsi-smp.ko \
-        $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/scsi_transport_iscsi.ko
+install iscsi_sfnet-smp.ko \
+	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/iscsi_sfnet.ko
 %endif
 %endif
 
@@ -133,11 +127,21 @@
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/iscsi
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/iscsi
 
+install misc/iscsi.conf $RPM_BUILD_ROOT/etc
+:> $RPM_BUILD_ROOT/etc/fstab.iscsi
 :> $RPM_BUILD_ROOT/etc/initiatorname.iscsi
 
-install etc/iscsid.conf $RPM_BUILD_ROOT/etc
+:> $RPM_BUILD_ROOT/var/lib/iscsi/bindings
 
-install usr/iscsid usr/iscsiadm $RPM_BUILD_ROOT%{_sbindir}
+install misc/scripts/iscsi-mountall misc/scripts/iscsi-umountall misc/scripts/iscsi-ls $RPM_BUILD_ROOT%{_sbindir}
+
+install man/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
+install man/*.5 $RPM_BUILD_ROOT%{_mandir}/man5
+install man/*.8 $RPM_BUILD_ROOT%{_mandir}/man8
+
+cd Linux-*/obj
+install utils/iscsi-boot/init $RPM_BUILD_ROOT%{_sbindir}/iscsi-init
+install utils/iscsi-device utils/iscsi-iname iscsid $RPM_BUILD_ROOT%{_sbindir}
 %endif
 
 %clean
@@ -164,7 +168,7 @@
 #fi
 
 if ! grep -q "^InitiatorName=[^ \t\n]" /etc/initiatorname.iscsi 2>/dev/null ; then
-	echo "InitiatorName=$(hostname -f)" >> /etc/initiatorname.iscsi
+	echo "InitiatorName=$(iscsi-iname)" >> /etc/initiatorname.iscsi
 fi
 
 %preun
@@ -178,12 +182,16 @@
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
-%doc README THANKS TODO
+%doc README
 %attr(755,root,root) %{_sbindir}/*
-%attr(750,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/iscsid.conf
-%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/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
+%attr(750,root,root) %config(noreplace) %verify(not mtime md5 size) /etc/iscsi.conf
+%attr(644,root,root) %config(noreplace) %verify(not mtime md5 size) /etc/fstab.iscsi
+%attr(644,root,root) %config(noreplace) %verify(not mtime md5 size) /etc/initiatorname.iscsi
+%dir /var/lib/iscsi
+%ghost /var/lib/iscsi/bindings
+%attr(644,root,root) %{_mandir}/man?/*
+%attr(754,root,root) /etc/rc.d/init.d/iscsi
+%attr(640,root,root) %config(noreplace) %verify(not mtime md5 size) /etc/sysconfig/iscsi
 %endif
 
 %if %{with kernel}
@@ -204,26 +212,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.30  2005/06/22 16:36:10  arekm
-- rel 1
-
-Revision 1.29  2005/06/22 16:16:02  arekm
-- up to 5.0.0.0.3rc6
-
-Revision 1.28  2005/06/02 19:27:10  qboosh
-- sorted verify() flags
-
-Revision 1.27  2005/06/02 12:14:18  arekm
-- ressurect /etc/initiatorname.iscsi
-
-Revision 1.26  2005/06/02 11:52:27  arekm
-- rel fix
-
-Revision 1.25  2005/06/02 11:51:55  arekm
-kernel modules install fix
-
-Revision 1.24  2005/06/02 11:47:55  arekm
-- up to 5.0.0.2
+Revision 1.31  2005/07/06 11:27:16  arekm
+- 4.0 series back on head
 
 Revision 1.23  2005/05/01 18:02:05  glen
 - %description url unification
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/linux-iscsi.spec?r1=1.30&r2=1.31&f=u




More information about the pld-cvs-commit mailing list