X-Git-Url: http://git.pld-linux.org/?p=packages%2Fe1000.git;a=blobdiff_plain;f=e1000.spec;h=af7534ed2e24cf4c60ec8b0da58e0a4a1a546791;hp=c76b788b75b549793f0b0490902e6399ee751102;hb=7b07a70c3e8e0b983c4c2badc5000db36c127ac6;hpb=c4eb67e0e762b92b73ea02f662f8741ebd3a6137 diff --git a/e1000.spec b/e1000.spec index c76b788..af7534e 100644 --- a/e1000.spec +++ b/e1000.spec @@ -1,27 +1,27 @@ # # Conditional build: %bcond_without dist_kernel # allow non-distribution kernel -%bcond_without smp # don't build SMP module %bcond_with verbose # verbose build (V=1) # -Summary: Intel(R) PRO/1000 driver for Linux -Summary(pl): Sterownik do karty Intel(R) PRO/1000 -Name: kernel-net-e1000 -Version: 6.0.54 %define _rel 1 +%define _mod_name e1000 +# +Summary: Intel(R) PRO/1000 driver for Linux +Summary(pl.UTF-8): Sterownik do karty Intel(R) PRO/1000 +Name: kernel%{_alt_kernel}-net-e1000 +Version: 7.6.12 Release: %{_rel}@%{_kernel_ver_str} License: GPL v2 -Vendor: Intel Corporation Group: Base/Kernel -Source0: ftp://aiedownload.intel.com/df-support/2897/eng/e1000-%{version}.tar.gz -# Source0-md5: 4e8c7f8c4485a6ebe19380db027cd87e -URL: http://support.intel.com/support/network/adapter/index.htm#PRO/1000 -%{?with_dist_kernel:BuildRequires: kernel-module-build >= 2.6.7} -BuildRequires: rpmbuild(macros) >= 1.211 +Source0: http://dl.sourceforge.net/e1000/%{_mod_name}-%{version}.tar.gz +# Source0-md5: e3a54d3a2862b378eeddfa2ce6298cae +URL: http://sourceforge.net/projects/e1000/ +%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.20.2} +BuildRequires: rpmbuild(macros) >= 1.379 Requires(post,postun): /sbin/depmod %if %{with dist_kernel} -%requires_releq_kernel_up -Requires(postun): %releq_kernel_up +%requires_releq_kernel +Requires(postun): %releq_kernel %endif Provides: kernel(e1000) Obsoletes: e1000 @@ -32,78 +32,25 @@ 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 -Summary: Intel(R) PRO/1000 driver for Linux SMP -Summary(pl): Sterownik do karty Intel(R) PRO/1000 -Release: %{_rel}@%{_kernel_ver_str} -Group: Base/Kernel -Requires(post,postun): /sbin/depmod -%if %{with dist_kernel} -%requires_releq_kernel_smp -Requires(postun): %releq_kernel_smp -%endif -Provides: kernel(e1000) -Obsoletes: e1000 -Obsoletes: linux-net-e1000 - -%description -n 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 -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 include - install -d include/{linux,config} - 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 - -cat >Makefile < src/Makefile <<'EOF' +obj-m := e1000.o +e1000-objs := e1000_main.o e1000_82540.o e1000_82542.o e1000_82571.o e1000_82541.o \ +e1000_82543.o e1000_ich8lan.o e1000_80003es2lan.o e1000_mac.o e1000_nvm.o e1000_phy.o \ +e1000_manage.o e1000_param.o e1000_ethtool.o kcompat.o e1000_api.o EOF - %{__make} -C %{_kernelsrcdir} clean \ - RCS_FIND_IGNORE="-name '*.ko' -o" \ - M=$PWD O=$PWD \ - %{?with_verbose:V=1} - %{__make} -C %{_kernelsrcdir} modules \ - EXTRA_CFLAGS='-DE1000_NAPI' \ - CC="%{__cc}" CPP="%{__cpp}" \ - M=$PWD O=$PWD \ - %{?with_verbose:V=1} - - mv e1000i{,-$cfg}.ko -done +%build +%build_kernel_modules -C src -m %{_mod_name} %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/%{_mod_name} -d kernel/drivers/net -n %{_mod_name} -s current %clean rm -rf $RPM_BUILD_ROOT @@ -114,18 +61,8 @@ rm -rf $RPM_BUILD_ROOT %postun %depmod %{_kernel_ver} -%post -n kernel-smp-net-e1000 -%depmod %{_kernel_ver}smp - -%postun -n 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/* - -%files -n kernel-smp-net-e1000 -%defattr(644,root,root,755) -%doc e1000.7 README ldistrib.txt -/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/* +%doc e1000.7 README +/etc/modprobe.d/%{_kernel_ver}/%{_mod_name}.conf +/lib/modules/%{_kernel_ver}/kernel/drivers/net/%{_mod_name}*.ko*