#
# TODO:
-# - fix %%install, %%files
-# - add utils/scripts, eagleconfig, firmware
+# - 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_without cmvs
%bcond_with verbose # verbose build (V=1)
#
+%ifarch sparc
+# no USB in sparc(32) kernel; just build userspace to use with sparc64 kernel
+%undefine with_kernel
+%endif
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.9.6
-%define _rel 0.1
+Version: 2.3.2
+%define _rel 5
Release: %{_rel}
License: GPL v2
Group: Base/Kernel
-Source0: http://download.gna.org/eagleusb/%{name}-%{version}.tar.bz2
-# Source0-md5: d2d94f396132e34417fa1b26bcde7287
-#Patch0: eagle-Makefile.patch
-#Patch1: eagle-firmware.patch
-#Patch2: %{name}-user2.6.patch
-#Patch3: %{name}-info_about_VPI_VCI.patch
-Patch4: %{name}-eu_main.patch
-Patch5: %{name}-eu_types.patch
+Source0: http://download.gna.org/eagleusb/eagle-usb-2.3.0/%{name}-%{version}.tar.bz2
+# Source0-md5: 91727db818e5170b2d78a99ee51c2d58
+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-module-build >= 2.6.7}
BuildRequires: rpmbuild(macros) >= 1.153
%endif
+BuildRequires: net-tools
+BuildRequires: SysVinit
Requires: ppp >= 2.4.1
-Requires: kernel-usb-eagle = %{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/840/908/...) 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-eagle
Summary: Linux driver for the Eagle 8051 Analog (sagem f@st 800/840/908/...) modems
Obsoletes: kernel-usb-fast800
%description -n kernel-usb-eagle
-Linux driver for the Eagle 8051 Analog (sagem f@st 800/840/908/...) modems.
+Linux driver for the Eagle 8051 Analog (sagem f@st 800/840/908/...)
+modems.
%description -n kernel-usb-eagle -l pl
-Sterownik dla Linuksa do modemów Eagle 8051 Analog (sagem f@st 800/840/908/...).
+Sterownik dla Linuksa do modemów Eagle 8051 Analog (sagem f@st
+800/840/908/...).
%package -n kernel-smp-usb-eagle
Summary: Linux SMP driver for the Eagle 8051 Analog (sagem f@st 800/840/908/...) modems
Group: Base/Kernel
%{?with_dist_kernel:%requires_releq_kernel_smp}
Requires(post,postun): /sbin/depmod
-Provides: kernel-usb-eagle
+Provides: kernel-usb-eagle = %{version}-%{_rel}@%{_kernel_ver_str}
Obsoletes: kernel-smp-usb-fast800
%description -n kernel-smp-usb-eagle
-Linux SMP driver for the Eagle 8051 Analog (sagem f@st 800/840/908/...) modems.
+Linux SMP driver for the Eagle 8051 Analog (sagem f@st
+800/840/908/...) modems.
%description -n kernel-smp-usb-eagle -l pl
-Sterownik dla Linuksa SMP do modemów Eagle 8051 Analog (sagem f@st 800/840/908/...).
+Sterownik dla Linuksa SMP do modemów Eagle 8051 Analog (sagem f@st
+800/840/908/...).
%prep
%setup -q
-#patch0 -p1
-#patch1 -p1
-#patch2 -p1
-#patch3 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
%ifnarch %{ix86}
# invalid not only for ppc
%if %{with kernel}
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-up .config
- ln -sf %{_kernelsrcdir}/include/linux/autoconf-up.h include/linux/autoconf.h
- ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
- touch include/config/MARKER
- %{__make} -C %{_kernelsrcdir} modules \
- RCS_FIND_IGNORE="-name '*.ko' -o" \
- M=$PWD O=$PWD \
- %{?with_verbose:V=1}
- mv eagle-usb{,-$cfg}.ko
+ 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
+%ifarch ppc ppc64
+ install -d include/asm
+ [ ! -d %{_kernelsrcdir}/include/asm-powerpc ] || ln -sf %{_kernelsrcdir}/include/asm-powerpc/* include/asm
+ [ ! -d %{_kernelsrcdir}/include/asm-%{_target_base_arch} ] || ln -snf %{_kernelsrcdir}/include/asm-%{_target_base_arch}/* include/asm
+%else
+ ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
+%endif
+ ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
+ 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} \
+ USE_CMVS=%{?with_cmvs:1}%{!?with_cmvs:0}
+ mv eagle-usb{,-$cfg}.ko
done
cd -
%endif
%if %{with userspace}
-for i in driver/firmware driver/user pppoa; do
- %{__make} -C $i \
- CC="%{__cc}" \
- CFLAGS="%{rpmcflags}" \
- LDFLAGS="%{rpmldflags}"
-done
+%{__aclocal} -I .
+%{__autoconf}
+%configure \
+ %{!?with_cmvs:--disable-cmvs} \
+ --with-dsp-dir=%{_datadir}/misc
+%{__make} -C driver/firmware \
+ OPT="%{rpmcflags}"
+%{__make} -C driver/user \
+ OPT="%{rpmcflags}"
+%{__make} -C pppoa \
+ OPT="%{rpmcflags}"
%endif
%install
%if %{with kernel}
cd driver
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/kernel/drivers/usb
+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/eagle-usb.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/eagle-usb.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%{_sysconfdir}/{analog,hotplug,ppp} \
$RPM_BUILD_ROOT{%{_sbindir},%{_libdir}/hotplug/eagle}
-
-install utils/scripts/usb.usermap $RPM_BUILD_ROOT%{_libdir}/hotplug/eagle
-
%{__make} -C driver/firmware install \
- INSTALL=install \
EU_DSP_DIR=$RPM_BUILD_ROOT%{_datadir}/misc
-
%{__make} -C driver/user install \
- INSTALL=install \
- SBINDIR=$RPM_BUILD_ROOT%{_sbindir} \
- EU_SCRIPT_DIR=$RPM_BUILD_ROOT%{_sysconfdir}/analog
-
-install pppoa/pppoa \
- $RPM_BUILD_ROOT%{_sbindir}
-
-echo 'n
-
-
-n
-n
-' | %{__make} -C utils/scripts install \
- INSTALLDIR=%{_sbindir} \
- CONFIGDIR=%{_sysconfdir}/analog \
- HOTPLUGDIR=%{_sysconfdir}/hotplug \
- PPPDIR=%{_sysconfdir}/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-eagle
%depmod %{_kernel_ver}
-if [ -x %{_update_usb} ]; then
- /sbin/update-usb.usermap
-fi
%postun -n kernel-usb-eagle
%depmod %{_kernel_ver}
-if [ -x %{_update_usb} ]; then
- /sbin/update-usb.usermap
-fi
-%post -n kernel-smp-usb-eagle
+%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-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 README
-%dir %{_sysconfdir}/analog
-#%%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/analog/adiusbadsl.conf
-#%%{_sysconfdir}/analog/CMV*
-%{_sysconfdir}/analog/eagle-usb.conf*
-#%%attr(755,root,root) %{_sysconfdir}/hotplug/usb/*
-%{_libdir}/hotplug/eagle
-#%%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/ppp/*.adsl
+%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-eagle
%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}/kernel/drivers/usb/*.ko*
+/lib/modules/%{_kernel_ver}/kernel/drivers/usb/net/*.ko*
%if %{with smp} && %{with dist_kernel}
%files -n kernel-smp-usb-eagle
%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/kernel/drivers/usb/*.ko*
+/lib/modules/%{_kernel_ver}smp/kernel/drivers/usb/net/*.ko*
%endif
%endif
projects / packages / eagle-usb.git / blobdiff