X-Git-Url: http://git.pld-linux.org/?p=packages%2Fe1000.git;a=blobdiff_plain;f=e1000.spec;h=76059cdd41644d4f7c390340f5800e33869e89f2;hp=7ac39c72ba6ee379a24fb0e6ffad283cf6ecc5f0;hb=80546c680008a6bbd531a2790bd910ea8641adaa;hpb=960655bb939d41ba094945d3ba34a2ad0c46666c diff --git a/e1000.spec b/e1000.spec index 7ac39c7..76059cd 100644 --- a/e1000.spec +++ b/e1000.spec @@ -4,19 +4,19 @@ %bcond_without smp # don't build SMP module %bcond_with verbose # verbose build (V=1) # -%define _rel 1 +%define _rel 2 Summary: Intel(R) PRO/1000 driver for Linux -Summary(pl): Sterownik do karty Intel(R) PRO/1000 -Name: kernel-net-e1000 -Version: 7.0.38 +Summary(pl.UTF-8): Sterownik do karty Intel(R) PRO/1000 +Name: kernel%{_alt_kernel}-net-e1000 +Version: 7.2.9 Release: %{_rel}@%{_kernel_ver_str} License: GPL v2 Group: Base/Kernel Source0: ftp://aiedownload.intel.com/df-support/9180/eng/e1000-%{version}.tar.gz -# Source0-md5: 1c1c8b63e1530a68c5c73c4a39cb218b +# Source0-md5: cb9f601df6c60f889aaabec475ba2089 URL: http://support.intel.com/support/network/adapter/index.htm#PRO/1000 -%{?with_dist_kernel:BuildRequires: kernel-module-build >= 3:2.6.7} -BuildRequires: rpmbuild(macros) >= 1.211 +%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.7} +BuildRequires: rpmbuild(macros) >= 1.330 Requires(post,postun): /sbin/depmod %if %{with dist_kernel} %requires_releq_kernel_up @@ -31,13 +31,13 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) This package contains the Linux driver for the Intel(R) PRO/1000 family of 10/100/1000 Ethernet network adapters. -%description -l pl +%description -l pl.UTF-8 Ten pakiet zawiera sterownik dla Linuksa do kart sieciowych 10/100/1000Mbit z rodziny Intel(R) PRO/1000. -%package -n kernel-smp-net-e1000 +%package -n kernel%{_alt_kernel}-smp-net-e1000 Summary: Intel(R) PRO/1000 driver for Linux SMP -Summary(pl): Sterownik do karty Intel(R) PRO/1000 +Summary(pl.UTF-8): Sterownik do karty Intel(R) PRO/1000 Release: %{_rel}@%{_kernel_ver_str} Group: Base/Kernel Requires(post,postun): /sbin/depmod @@ -49,75 +49,27 @@ Provides: kernel(e1000) Obsoletes: e1000 Obsoletes: linux-net-e1000 -%description -n kernel-smp-net-e1000 +%description -n kernel%{_alt_kernel}-smp-net-e1000 This package contains the Linux SMP driver for the Intel(R) PRO/1000 family of 10/100/1000 Ethernet network adapters. -%description -n kernel-smp-net-e1000 -l pl +%description -n kernel%{_alt_kernel}-smp-net-e1000 -l pl.UTF-8 Ten pakiet zawiera sterownik dla Linuksa SMP do kart sieciowych 10/100/1000Mbit z rodziny Intel(R) PRO/1000. %prep %setup -q -n e1000-%{version} - -%build -cd src -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 o - install -d o/include/{linux,config} - ln -sf %{_kernelsrcdir}/config-$cfg o/.config - ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers - ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h -%ifarch ppc - if [ -d "%{_kernelsrcdir}/include/asm-powerpc" ]; then - install -d include/asm - cp -a %{_kernelsrcdir}/include/asm-%{_target_base_arch}/* o/include/asm - cp -a %{_kernelsrcdir}/include/asm-powerpc/* o/include/asm - else - ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} o/include/asm - fi -%else - ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} o/include/asm -%endif - -cat >o/Makefile < src/Makefile <<'EOF' +obj-m := e1000.o +e1000-objs := e1000_main.o e1000_hw.o e1000_param.o e1000_ethtool.o kcompat.o EOF - %{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts - %{__make} -C %{_kernelsrcdir} clean \ - RCS_FIND_IGNORE="-name '*.ko' -o" \ - M=$PWD O=$PWD/o \ - %{?with_verbose:V=1} - %{__make} -C %{_kernelsrcdir} modules \ -%if "%{_target_base_arch}" != "%{_arch}" - ARCH=%{_target_base_arch} \ - CROSS_COMPILE=%{_target_cpu}-pld-linux- \ -%endif - HOSTCC="%{__cc}" \ - EXTRA_CFLAGS='-DE1000_NAPI' \ - M=$PWD O=$PWD/o \ - %{?with_verbose:V=1} - - mv e1000{,i-$cfg}.ko -done +%build +%build_kernel_modules -C src -m e1000 %install rm -rf $RPM_BUILD_ROOT - -install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/kernel/drivers/net -cd src -install e1000i-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \ - $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/drivers/net/e1000i.ko -%if %{with smp} && %{with dist_kernel} -install e1000i-smp.ko \ - $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/e1000i.ko -%endif -cd .. +%install_kernel_modules -m src/e1000 -d kernel/drivers/net -n e1000 -s current %clean rm -rf $RPM_BUILD_ROOT @@ -128,20 +80,22 @@ rm -rf $RPM_BUILD_ROOT %postun %depmod %{_kernel_ver} -%post -n kernel-smp-net-e1000 +%post -n kernel%{_alt_kernel}-smp-net-e1000 %depmod %{_kernel_ver}smp -%postun -n kernel-smp-net-e1000 +%postun -n kernel%{_alt_kernel}-smp-net-e1000 %depmod %{_kernel_ver}smp %files %defattr(644,root,root,755) %doc e1000.7 README ldistrib.txt -/lib/modules/%{_kernel_ver}/kernel/drivers/net/* +/etc/modprobe.d/%{_kernel_ver}/e1000.conf +/lib/modules/%{_kernel_ver}/kernel/drivers/net/e1000*.ko* %if %{with smp} && %{with dist_kernel} -%files -n kernel-smp-net-e1000 +%files -n kernel%{_alt_kernel}-smp-net-e1000 %defattr(644,root,root,755) %doc e1000.7 README ldistrib.txt -/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/* +/etc/modprobe.d/%{_kernel_ver}smp/e1000.conf +/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/e1000*.ko* %endif