#
+# 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 userspace # don't build userspace tools
+%bcond_with verbose # verbose build (V=1)
#
-%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...)
+Summary: Linux driver for the Eagle 8051 Analog (sagem f@st 800/840/908/...) modems
+Summary(pl): 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.2.0
+%define _rel 2
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.2.0/%{name}-%{version}.tar.bz2
+# Source0-md5: ad3d985b324b97de736f1efb723deb5d
+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
+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-module-build >= 2.6.7}
+BuildRequires: rpmbuild(macros) >= 1.153
%endif
+BuildRequires: net-tools
+BuildRequires: SysVinit
Requires: ppp >= 2.4.1
-%{?with_dist_kernel:Requires: kernel-usb-%{_orig_name} = %{version}-%{_rel}@%{_kernel_ver_str}}
+Requires: kernel-usb-eagle = %{version}-%{_rel}@%{_kernel_ver_str}
+Conflicts: eagle-usb24
Obsoletes: eagle-utils
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...).
+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-usb-eagle
+Summary: Linux driver for the Eagle 8051 Analog (sagem f@st 800/840/908/...) modems
+Summary(pl): 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
+Obsoletes: kernel-usb-fast800
-%description -n kernel-usb-%{_orig_name}
-Linux driver for the Eagle 8051 Analog (sagem f@st 800...) modems.
+%description -n 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
+%description -n kernel-usb-eagle -l pl
Sterownik dla Linuksa do modemów Eagle 8051 Analog (sagem f@st
-800...).
+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-smp-usb-eagle
+Summary: Linux SMP driver for the Eagle 8051 Analog (sagem f@st 800/840/908/...) modems
+Summary(pl): 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}@%{_kernel_ver_str}
+Obsoletes: kernel-smp-usb-fast800
-%description -n kernel-smp-usb-%{_orig_name}
-Linux SMP driver for the Eagle 8051 Analog (sagem f@st 800...) modems.
+%description -n 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
+%description -n kernel-smp-usb-eagle -l pl
Sterownik dla Linuksa SMP do modemów Eagle 8051 Analog (sagem f@st
-800...).
+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
+
+%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
+cd driver
+for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
+ if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
+ exit 1
+ fi
+ rm -rf include
+ install -d include/{config,linux}
+ ln -sf %{_kernelsrcdir}/config-$cfg .config
+ ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
+ ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
+ touch include/config/MARKER
+ %{__make} -C %{_kernelsrcdir} clean \
+ RCS_FIND_IGNORE="-name '*.ko' -o" \
+ M=$PWD O=$PWD \
+ %{?with_verbose:V=1}
+ %{__make} -C %{_kernelsrcdir} modules \
+ M=$PWD O=$PWD \
+ %{?with_verbose:V=1}
+ mv eagle-usb{,-$cfg}.ko
+done
+cd -
%endif
%if %{with userspace}
-%{__make} -C driver binaryfirmware adiuser \
- CC="%{__cc}" \
- CFLAGS="%{rpmcflags} -Wall -DLINUX"
-
+%{__aclocal} -I .
+%{__autoconf}
+%configure \
+ --with-dsp-dir=%{_datadir}/misc
+%{__make} -C driver/firmware \
+ OPT="%{rpmcflags}"
+%{__make} -C driver/user \
+ 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
+cd driver
+install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/kernel/drivers/usb/net
+install eagle-usb-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
+ $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/drivers/usb/net/eagle-usb.ko
+%if %{with smp} && %{with dist_kernel}
+install eagle-usb-smp.ko \
+ $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/drivers/usb/net/eagle-usb.ko
+%endif
+cd -
%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-usb-eagle
%depmod %{_kernel_ver}
-if [ -x %{_update_usb} ]; then
- /sbin/update-usb.usermap
-fi
-%postun -n kernel-usb-%{_orig_name}
+%postun -n 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-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-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-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-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
projects / packages / eagle-usb.git / blobdiff