X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=eagle-usb.spec;h=71fbf7f67cb0f8e67a99779f0c3ef75018280851;hb=4041923143555fae202bd55da3a877b508d3aa9e;hp=09c48b546c1270a678e1b55436eacf241cf479cb;hpb=dc3756e3c5e83e4ad9a245925c94855e80e5a307;p=packages%2Feagle-usb.git

diff --git a/eagle-usb.spec b/eagle-usb.spec
index 09c48b5..71fbf7f 100644
--- a/eagle-usb.spec
+++ b/eagle-usb.spec
@@ -1,215 +1,203 @@
 #
+# TODO:
+#		- utils/scripts, eagleconfig
+#
 # Conditional build:
 %bcond_without	dist_kernel	# without distribution kernel
 %bcond_without	kernel		# don't build kernel modules
+%bcond_without	smp		# don't build SMP module
+%bcond_without	up		# don't build UP module
 %bcond_without	userspace	# don't build userspace tools
+%bcond_without	cmvs
+%bcond_with	verbose		# verbose build (V=1)
+%bcond_with	grsec_kernel	# build for kernel-grsecurity
+#
+%if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
+%define	alt_kernel	grsecurity
+%endif
 #
-%define		_orig_name	fast800
-%define		_update_usb /sbin/update-usb.usermap
-Summary:	Linux driver for the Eagle 8051 Analog (sagem f@st 800...) modems
-Summary(pl):	Sterownik dla Linuksa do modemów Eagle 8051 Analog (sagem f@st 800...)
+%ifarch sparc
+# no USB in sparc(32) kernel; just build userspace to use with sparc64 kernel
+%undefine	with_kernel
+%endif
+%define		_rel	4
+Summary:	Linux driver for the Eagle 8051 Analog (sagem f@st 800/840/908/...) modems
+Summary(pl.UTF-8):   Sterownik dla Linuksa do modemów Eagle 8051 Analog (sagem f@st 800/840/908/...)
 Name:		eagle-usb
-Version:	1.0.4
-%define	_rel	7
+Version:	2.3.3
 Release:	%{_rel}
-License:	GPL
+License:	GPL v2
 Group:		Base/Kernel
-Source0:	http://fast800.tuxfamily.org/pub/IMG/gz/eagle-%{version}.tar.gz
-# Source0-md5:	fc52cf1eff6ab9f20e9c2cb3e7e2f1e8
-Patch0:		eagle-Makefile.patch
-Patch1:		eagle-firmware.patch
-Patch2:		%{name}-user2.6.patch
-URL:		http://fast800.tuxfamily.org/
+Source0:	http://download.gna.org/eagleusb/eagle-usb-2.3.0/%{name}-%{version}.tar.bz2
+# Source0-md5:	6c961a5022274aff870e49e2f0f922fc
+Patch1:		%{name}-eu_types.patch
+Patch2:		%{name}-vpivci-info.patch
+Patch3:		%{name}-opt.patch
+Patch4:		%{name}-signal.patch
+Patch5:		%{name}-usb_kill_urb.patch
+Patch6:		%{name}-kernel_sources_checking_hack.patch
+# Workaround for obsolete kernel API. To be removed...
+Patch7:		%{name}-spin_lock_unlocked.patch
+Patch8:		%{name}-kill_owner.patch
+Patch9:		%{name}-module_param.patch
+URL:		http://gna.org/projects/eagleusb/
+BuildRequires:	autoconf
+BuildRequires:	automake
 %if %{with kernel}
-%{?with_dist_kernel:BuildRequires:	kernel-headers < 2.5}
-BuildRequires:	%{kgcc_package}
-BuildRequires:	rpmbuild(macros) >= 1.118
+%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.7}
+BuildRequires:	rpmbuild(macros) >= 1.330
 %endif
+BuildRequires:	SysVinit
+BuildRequires:	net-tools
 Requires:	ppp >= 2.4.1
-%{?with_dist_kernel:Requires:	kernel-usb-%{_orig_name} = %{version}-%{_rel}@%{_kernel_ver_str}}
 Obsoletes:	eagle-utils
+Conflicts:	eagle-usb24
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-
 %description
-Linux driver for the Eagle 8051 Analog (sagem f@st 800...) modems.
+Linux driver for the Eagle 8051 Analog (sagem f@st 800/840/908/...)
+modems.
 
-%description -l pl
-Sterownik dla Linuksa do modemów Eagle 8051 Analog (sagem f@st
-800...).
+%description -l pl.UTF-8
+Sterownik dla Linuksa do modemów Eagle 8051 Analog (sagem f@st
+800/840/908/...).
 
-%package -n kernel-usb-%{_orig_name}
-Summary:	Linux driver for the Eagle 8051 Analog (sagem f@st 800...) modems
-Summary(pl):	Sterownik dla Linuksa do modemów Eagle 8051 Analog (sagem f@st 800...)
+%package -n kernel%{_alt_kernel}-usb-eagle
+Summary:	Linux driver for the Eagle 8051 Analog (sagem f@st 800/840/908/...) modems
+Summary(pl.UTF-8):   Sterownik dla Linuksa do modemów Eagle 8051 Analog (sagem f@st 800/840/908/...)
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 %{?with_dist_kernel:%requires_releq_kernel_up}
 Requires(post,postun):	/sbin/depmod
+Provides:	kernel-usb(eagle) = %{version}-%{_rel}
+%if "%{_alt_kernel}" == "%{_nil}"
+Obsoletes:	kernel-usb-fast800
+%endif
 
-%description -n kernel-usb-%{_orig_name}
-Linux driver for the Eagle 8051 Analog (sagem f@st 800...) modems.
+%description -n kernel%{_alt_kernel}-usb-eagle
+Linux driver for the Eagle 8051 Analog (sagem f@st 800/840/908/...)
+modems.
 
-%description -n kernel-usb-%{_orig_name} -l pl
-Sterownik dla Linuksa do modemów Eagle 8051 Analog (sagem f@st
-800...).
+%description -n kernel%{_alt_kernel}-usb-eagle -l pl.UTF-8
+Sterownik dla Linuksa do modemów Eagle 8051 Analog (sagem f@st
+800/840/908/...).
 
-%package -n kernel-smp-usb-%{_orig_name}
-Summary:	Linux SMP driver for the Eagle 8051 Analog (sagem f@st 800...) modems
-Summary(pl):	Sterownik dla Linuksa SMP do modemów Eagle 8051 Analog (sagem f@st 800...)
+%package -n kernel%{_alt_kernel}-smp-usb-eagle
+Summary:	Linux SMP driver for the Eagle 8051 Analog (sagem f@st 800/840/908/...) modems
+Summary(pl.UTF-8):   Sterownik dla Linuksa SMP do modemów Eagle 8051 Analog (sagem f@st 800/840/908/...)
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 %{?with_dist_kernel:%requires_releq_kernel_smp}
-%{?with_dist_kernel:Provides:	kernel-usb-%{_orig_name}}
 Requires(post,postun):	/sbin/depmod
+Provides:	kernel-usb(eagle) = %{version}-%{_rel}
+%if "%{_alt_kernel}" == "%{_nil}"
+Obsoletes:	kernel-smp-usb-fast800
+%endif
 
-%description -n kernel-smp-usb-%{_orig_name}
-Linux SMP driver for the Eagle 8051 Analog (sagem f@st 800...) modems.
+%description -n kernel%{_alt_kernel}-smp-usb-eagle
+Linux SMP driver for the Eagle 8051 Analog (sagem f@st
+800/840/908/...) modems.
 
-%description -n kernel-smp-usb-%{_orig_name} -l pl
-Sterownik dla Linuksa SMP do modemów Eagle 8051 Analog (sagem f@st
-800...).
+%description -n kernel%{_alt_kernel}-smp-usb-eagle -l pl.UTF-8
+Sterownik dla Linuksa SMP do modemów Eagle 8051 Analog (sagem f@st
+800/840/908/...).
 
 %prep
-%setup -q -n eagle-%{version}
-%patch0 -p1
+%setup -q
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+
+%ifnarch %{ix86}
+# invalid not only for ppc
+sed -i 's/-mpreferred-stack-boundary=2//' driver/Makefile
+%endif
 
 %build
 %if %{with kernel}
-install -d kernel-{up,smp}
-
-# UP
-%{__make} clean
-%{__make} -C driver \
-	CC=%{kgcc} \
-%ifarch %{ix86} 
-	OPT="-I/usr/src/linux/include/asm-i386/mach-default" \
-%endif
-	KERNELSRC="%{_kernelsrcdir}"
-install driver/adiusbadsl.o kernel-up
-
-# SMP
-CONFIG_SMP=y; export CONFIG_SMP
-%{__make} -C driver clean
-%{__make} -C driver \
-	CC=%{kgcc} \
-%ifarch %{ix86} 
-	OPT="-I/usr/src/linux/include/asm-i386/mach-default -DSMP -D__SMP__" \
-%else
-	OPT="-D__SMP__ -DSMP" \
-%endif
-	KERNELSRC="%{_kernelsrcdir}"
-install driver/adiusbadsl.o kernel-smp
+%build_kernel_modules -C driver -m eagle-usb \
+	USE_CMVS=%{?with_cmvs:1}%{!?with_cmvs:0}
 %endif
 
 %if %{with userspace}
-%{__make} -C driver binaryfirmware adiuser \
-	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags} -Wall -DLINUX"
+%{__aclocal} -I .
+%{__autoconf}
+%configure \
+	%{!?with_cmvs:--disable-cmvs} \
+	--with-dsp-dir=%{_datadir}/misc
 
+%{__make} -C driver/firmware \
+	CC="%{__cc}" \
+	OPT="%{rpmcflags}"
+%{__make} -C driver/user \
+	CC="%{__cc}" \
+	OPT="%{rpmcflags}"
 %{__make} -C pppoa \
 	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags} -Wall -ansi \$(DEFINES) \$(PATHS)"
+	OPT="%{rpmcflags}"
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %if %{with kernel}
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/kernel/drivers/usb
-install kernel-up/*.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/drivers/usb
-install kernel-smp/*.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/drivers/usb
+%install_kernel_modules -m driver/eagle-usb -d kernel/drivers/usb/net
 %endif
 
 %if %{with userspace}
-install -d $RPM_BUILD_ROOT/etc/{analog,hotplug,ppp} \
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/{analog,hotplug,ppp} \
 	$RPM_BUILD_ROOT{%{_sbindir},%{_libdir}/hotplug/eagle}
-
-install scripts/hotplug/usb.usermap $RPM_BUILD_ROOT%{_libdir}/hotplug/eagle
-
 %{__make} -C driver/firmware install \
-	CONFIGDIR=$RPM_BUILD_ROOT/etc/analog \
-	DESTDIR=$RPM_BUILD_ROOT
-
+	EU_DSP_DIR=$RPM_BUILD_ROOT%{_datadir}/misc
 %{__make} -C driver/user install \
-	INSTALLDIR=%{_sbindir} \
-	CONFIGDIR=/etc/analog \
-	DESTDIR=$RPM_BUILD_ROOT
-
-install pppoa/pppoa $RPM_BUILD_ROOT%{_sbindir}
-echo 'n
-
-
-n
-n
-' | %{__make} -C scripts install \
-	INSTALLDIR=%{_sbindir} \
-	CONFIGDIR=/etc/analog \
-	HOTPLUGDIR=/etc/hotplug \
-	PPPDIR=/etc/ppp \
-	DESTDIR=$RPM_BUILD_ROOT
+	EU_DIR=$RPM_BUILD_ROOT%{_sysconfdir}/eagle-usb \
+	EU_SCRIPT_DIR=$RPM_BUILD_ROOT%{_sysconfdir}/eagle-usb \
+	SBINDIR=$RPM_BUILD_ROOT%{_sbindir}
+mv $RPM_BUILD_ROOT%{_sysconfdir}/eagle-usb/eagle-usb.conf{.template,}
+%{__make} -C pppoa install \
+	SBINDIR=$RPM_BUILD_ROOT%{_sbindir}
 %endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-if [ -x %{_update_usb} ]; then
-	/sbin/update-usb.usermap
-fi
-
-%postun
-if [ -x %{_update_usb} ]; then
-	/sbin/update-usb.usermap
-fi
-
-%post -n kernel-usb-%{_orig_name}
+%post -n kernel%{_alt_kernel}-usb-eagle
 %depmod %{_kernel_ver}
-if [ -x %{_update_usb} ]; then
-	/sbin/update-usb.usermap
-fi
 
-%postun -n kernel-usb-%{_orig_name}
+%postun -n kernel%{_alt_kernel}-usb-eagle
 %depmod %{_kernel_ver}
-if [ -x %{_update_usb} ]; then
-	/sbin/update-usb.usermap
-fi
 
-%post	-n kernel-smp-usb-%{_orig_name}
+%post -n kernel%{_alt_kernel}-smp-usb-eagle
 %depmod %{_kernel_ver}smp
-if [ -x %{_update_usb} ]; then
-	/sbin/update-usb.usermap
-fi
 
-%postun -n kernel-smp-usb-%{_orig_name}
+%postun -n kernel%{_alt_kernel}-smp-usb-eagle
 %depmod %{_kernel_ver}smp
-if [ -x %{_update_usb} ]; then
-	/sbin/update-usb.usermap
-fi
 
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
-%doc BUGS Changelog FAQ TODO readme.txt
-%dir %{_sysconfdir}/analog
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/analog/adiusbadsl.conf
-%{_sysconfdir}/analog/CMV*
-%attr(755,root,root) %{_sysconfdir}/hotplug/usb/*
-%{_libdir}/hotplug/eagle
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/ppp/*.adsl
+%doc README
+%dir %{_sysconfdir}/eagle-usb
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/eagle-usb/eagle-usb.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/eagle-usb/*.txt
 %attr(755,root,root) %{_sbindir}/*
 %{_datadir}/misc/*.bin
 %endif
 
 %if %{with kernel}
-%files -n kernel-usb-%{_orig_name}
+%files -n kernel%{_alt_kernel}-usb-eagle
 %defattr(644,root,root,755)
-%doc readme.txt
-/lib/modules/%{_kernel_ver}/kernel/drivers/usb/*
+/lib/modules/%{_kernel_ver}/kernel/drivers/usb/net/*.ko*
 
-%files -n kernel-smp-usb-%{_orig_name}
+%if %{with smp} && %{with dist_kernel}
+%files -n kernel%{_alt_kernel}-smp-usb-eagle
 %defattr(644,root,root,755)
-%doc readme.txt
-/lib/modules/%{_kernel_ver}smp/kernel/drivers/usb/*
+/lib/modules/%{_kernel_ver}smp/kernel/drivers/usb/net/*.ko*
+%endif
 %endif