X-Git-Url: http://git.pld-linux.org/?p=packages%2Fe1000.git;a=blobdiff_plain;f=e1000.spec;h=ad0ddde7236e2348048ac769fa70c44f5c5c5ae6;hp=f76671ba58580dbc69dbd4a7fc97ea115e68cc0e;hb=0010d597cd3118d0a7ac04e122c340f49e0ecd11;hpb=902cb502a5681aaad1c6d2b2f3a8fca124841844

diff --git a/e1000.spec b/e1000.spec
index f76671b..ad0ddde 100644
--- a/e1000.spec
+++ b/e1000.spec
@@ -4,23 +4,19 @@
 %bcond_without	smp		# don't build SMP module
 %bcond_with	verbose		# verbose build (V=1)
 #
+%define		_rel	1
 Summary:	Intel(R) PRO/1000 driver for Linux
 Summary(pl):	Sterownik do karty Intel(R) PRO/1000
-Name:		kernel-net-e1000
-Version:	6.2.15
-%define		_rel	1
+Name:		kernel%{_alt_kernel}-net-e1000
+Version:	7.2.7
 Release:	%{_rel}@%{_kernel_ver_str}
 License:	GPL v2
-Vendor:		Intel Corporation
 Group:		Base/Kernel
 Source0:	ftp://aiedownload.intel.com/df-support/9180/eng/e1000-%{version}.tar.gz
-# Source0-md5:	83f16b6b3f255730e0649f23cfc01509
+# Source0-md5:	c2f12bd55839988addd5925873b99320
 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
-%ifarch sparc
-BuildRequires:	crosssparc64-gcc
-%endif
+%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.7}
+BuildRequires:	rpmbuild(macros) >= 1.308
 Requires(post,postun):	/sbin/depmod
 %if %{with dist_kernel}
 %requires_releq_kernel_up
@@ -31,11 +27,6 @@ Obsoletes:	e1000
 Obsoletes:	linux-net-e1000
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%ifarch sparc
-%define         _target_base_arch       sparc64
-%define         _target_cpu             sparc64
-%endif
-
 %description
 This package contains the Linux driver for the Intel(R) PRO/1000
 family of 10/100/1000 Ethernet network adapters.
@@ -44,7 +35,7 @@ family of 10/100/1000 Ethernet network adapters.
 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
 Release:	%{_rel}@%{_kernel_ver_str}
@@ -58,11 +49,11 @@ 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
 Ten pakiet zawiera sterownik dla Linuksa SMP do kart sieciowych
 10/100/1000Mbit z rodziny Intel(R) PRO/1000.
 
@@ -75,41 +66,45 @@ for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}
 	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
+	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}/* include/asm
-		cp -a %{_kernelsrcdir}/include/asm-powerpc/* include/asm
+		install -d o/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} include/asm
+		ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} o/include/asm
 	fi
 %else
-	ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
+	ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} o/include/asm
 %endif
-	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
-	touch include/config/MARKER
 
 cat >Makefile <<EOF
 obj-m := e1000i.o
 e1000i-objs := e1000_main.o e1000_hw.o e1000_param.o e1000_ethtool.o kcompat.o
 EOF
 
+	%{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
 	%{__make} -C %{_kernelsrcdir} clean \
 		RCS_FIND_IGNORE="-name '*.ko' -o" \
-		M=$PWD O=$PWD \
+		SYSSRC=%{_kernelsrcdir} \
+		SYSOUT=$PWD/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- \
+		ARCH=%{_target_base_arch} \
+		CROSS_COMPILE=%{_target_cpu}-pld-linux- \
 %endif
-                HOSTCC="%{__cc}" \
+		HOSTCC="%{__cc}" \
 		EXTRA_CFLAGS='-DE1000_NAPI' \
-		M=$PWD O=$PWD \
+		SYSSRC=%{_kernelsrcdir} \
+		SYSOUT=$PWD/o \
+		M=$PWD O=$PWD/o \
 		%{?with_verbose:V=1}
 
 	mv e1000i{,-$cfg}.ko
@@ -137,10 +132,10 @@ 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
@@ -149,7 +144,7 @@ rm -rf $RPM_BUILD_ROOT
 /lib/modules/%{_kernel_ver}/kernel/drivers/net/*
 
 %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/*