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

diff --git a/eagle-usb.spec b/eagle-usb.spec
index 5fb5dbe..71fbf7f 100644
--- a/eagle-usb.spec
+++ b/eagle-usb.spec
@@ -6,81 +6,100 @@
 %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
+#
+%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):	Sterownik dla Linuksa do modemów Eagle 8051 Analog (sagem f@st 800/840/908/...)
+Summary(pl.UTF-8):   Sterownik dla Linuksa do modemów Eagle 8051 Analog (sagem f@st 800/840/908/...)
 Name:		eagle-usb
-Version:	2.3.2
-%define		_rel	1
+Version:	2.3.3
 Release:	%{_rel}
 License:	GPL v2
 Group:		Base/Kernel
 Source0:	http://download.gna.org/eagleusb/eagle-usb-2.3.0/%{name}-%{version}.tar.bz2
-# Source0-md5:	91727db818e5170b2d78a99ee51c2d58
+# 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-module-build >= 2.6.7}
-BuildRequires:	rpmbuild(macros) >= 1.153
+%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.7}
+BuildRequires:	rpmbuild(macros) >= 1.330
 %endif
-BuildRequires:	net-tools
 BuildRequires:	SysVinit
+BuildRequires:	net-tools
 Requires:	ppp >= 2.4.1
-Requires:	kernel-usb-eagle = %{version}-%{_rel}@%{_kernel_ver_str}
-Conflicts:	eagle-usb24
 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/840/908/...)
 modems.
 
-%description -l pl
-Sterownik dla Linuksa do modemów Eagle 8051 Analog (sagem f@st
+%description -l pl.UTF-8
+Sterownik dla Linuksa do modemów Eagle 8051 Analog (sagem f@st
 800/840/908/...).
 
-%package -n kernel-usb-eagle
+%package -n kernel%{_alt_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/...)
+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-eagle
+%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-eagle -l pl
-Sterownik dla Linuksa do modemów Eagle 8051 Analog (sagem f@st
+%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-eagle
+%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):	Sterownik dla Linuksa SMP do modemów Eagle 8051 Analog (sagem f@st 800/840/908/...)
+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}
 Requires(post,postun):	/sbin/depmod
-Provides:	kernel-usb-eagle = %{version}-%{_rel}@%{_kernel_ver_str}
+Provides:	kernel-usb(eagle) = %{version}-%{_rel}
+%if "%{_alt_kernel}" == "%{_nil}"
 Obsoletes:	kernel-smp-usb-fast800
+%endif
 
-%description -n kernel-smp-usb-eagle
+%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-eagle -l pl
-Sterownik dla Linuksa SMP do modemów Eagle 8051 Analog (sagem f@st
+%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
@@ -91,6 +110,9 @@ Sterownik dla Linuksa SMP do modem
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 %ifnarch %{ix86}
 # invalid not only for ppc
@@ -99,40 +121,25 @@ sed -i 's/-mpreferred-stack-boundary=2//' driver/Makefile
 
 %build
 %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-$cfg .config
-	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
-	ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
-	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}
-	mv eagle-usb{,-$cfg}.ko
-done
-cd -
+%build_kernel_modules -C driver -m eagle-usb \
+	USE_CMVS=%{?with_cmvs:1}%{!?with_cmvs:0}
 %endif
 
 %if %{with userspace}
 %{__aclocal} -I .
 %{__autoconf}
 %configure \
-	--with-dsp-dir=%{_datadir}/misc 
+	%{!?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}" \
 	OPT="%{rpmcflags}"
 %endif
 
@@ -140,15 +147,7 @@ cd -
 rm -rf $RPM_BUILD_ROOT
 
 %if %{with kernel}
-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 -
+%install_kernel_modules -m driver/eagle-usb -d kernel/drivers/usb/net
 %endif
 
 %if %{with userspace}
@@ -168,16 +167,16 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/eagle-usb/eagle-usb.conf{.template,}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -n kernel-usb-eagle
+%post -n kernel%{_alt_kernel}-usb-eagle
 %depmod %{_kernel_ver}
 
-%postun -n kernel-usb-eagle
+%postun -n kernel%{_alt_kernel}-usb-eagle
 %depmod %{_kernel_ver}
 
-%post -n kernel-smp-usb-eagle
+%post -n kernel%{_alt_kernel}-smp-usb-eagle
 %depmod %{_kernel_ver}smp
 
-%postun -n kernel-smp-usb-eagle
+%postun -n kernel%{_alt_kernel}-smp-usb-eagle
 %depmod %{_kernel_ver}smp
 
 %if %{with userspace}
@@ -192,12 +191,12 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %if %{with kernel}
-%files -n kernel-usb-eagle
+%files -n kernel%{_alt_kernel}-usb-eagle
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/kernel/drivers/usb/net/*.ko*
 
 %if %{with smp} && %{with dist_kernel}
-%files -n kernel-smp-usb-eagle
+%files -n kernel%{_alt_kernel}-smp-usb-eagle
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}smp/kernel/drivers/usb/net/*.ko*
 %endif