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

diff --git a/e1000.spec b/e1000.spec
index ef3c61d..ad0ddde 100644
--- a/e1000.spec
+++ b/e1000.spec
@@ -1,26 +1,27 @@
 #
 # Conditional build:
-# _without_dist_kernel          without distribution kernel
+%bcond_without	dist_kernel	# allow non-distribution kernel
+%bcond_without	smp		# don't build SMP module
+%bcond_with	verbose		# verbose build (V=1)
 #
-%define		_orig_name	e1000
-
+%define		_rel	1
 Summary:	Intel(R) PRO/1000 driver for Linux
 Summary(pl):	Sterownik do karty Intel(R) PRO/1000
-Name:		kernel-net-%{_orig_name}
-Version:	4.4.12
-%define	_rel	1
+Name:		kernel%{_alt_kernel}-net-e1000
+Version:	7.2.7
 Release:	%{_rel}@%{_kernel_ver_str}
-License:	BSD
-Vendor:		Intel Corporation
+License:	GPL v2
 Group:		Base/Kernel
-Source0:	ftp://aiedownload.intel.com/df-support/4833/eng/%{_orig_name}-%{version}.tar.gz
-# Source0-md5:	eabb4c64beb14755c56b191a2fdc767a
-%{!?_without_dist_kernel:BuildRequires:         kernel-headers > 2.4 }
-BuildRequires:	%{kgcc_package}
-BuildRequires:	rpmbuild(macros) >= 1.118
-URL:		http://support.intel.com/support/network/adapter/pro100/
-%{!?_without_dist_kernel:%requires_releq_kernel_up}
+Source0:	ftp://aiedownload.intel.com/df-support/9180/eng/e1000-%{version}.tar.gz
+# Source0-md5:	c2f12bd55839988addd5925873b99320
+URL:		http://support.intel.com/support/network/adapter/index.htm#PRO/1000
+%{?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
+Requires(postun):	%releq_kernel_up
+%endif
 Provides:	kernel(e1000)
 Obsoletes:	e1000
 Obsoletes:	linux-net-e1000
@@ -34,44 +35,93 @@ 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-%{_orig_name}
+%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}
 Group:		Base/Kernel
-%{!?_without_dist_kernel:%requires_releq_kernel_smp}
 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-%{_orig_name}
+%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-%{_orig_name} -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.
 
 %prep
-%setup -q -n %{_orig_name}-%{version}
+%setup -q -n e1000-%{version}
 
 %build
-%ifarch %{ix86}
-%{__make} -C src SMP=1 CC="%{kgcc} -DCONFIG_X86_LOCAL_APIC -DSTB_WA" KSRC=%{_kernelsrcdir}
+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 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} o/include/asm
+	fi
 %else
-%{__make} -C src SMP=1 CC="%{kgcc} -DSTB_WA" KSRC=%{_kernelsrcdir}
+	ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} o/include/asm
+%endif
+
+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" \
+		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- \
 %endif
-mv -f src/%{_orig_name}.o src/%{_orig_name}-smp.o
-%{__make} -C src clean KSRC=%{_kernelsrcdir}
-%{__make} -C src CC="%{kgcc} -DSTB_WA" KSRC=%{_kernelsrcdir}
+		HOSTCC="%{__cc}" \
+		EXTRA_CFLAGS='-DE1000_NAPI' \
+		SYSSRC=%{_kernelsrcdir} \
+		SYSOUT=$PWD/o \
+		M=$PWD O=$PWD/o \
+		%{?with_verbose:V=1}
+
+	mv e1000i{,-$cfg}.ko
+done
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc
-install src/%{_orig_name}-smp.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/%{_orig_name}.o
-install src/%{_orig_name}.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/%{_orig_name}.o
+
+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 ..
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -82,18 +132,20 @@ rm -rf $RPM_BUILD_ROOT
 %postun
 %depmod %{_kernel_ver}
 
-%post	-n kernel-smp-net-%{_orig_name}
+%post	-n kernel%{_alt_kernel}-smp-net-e1000
 %depmod %{_kernel_ver}smp
 
-%postun -n kernel-smp-net-%{_orig_name}
+%postun -n kernel%{_alt_kernel}-smp-net-e1000
 %depmod %{_kernel_ver}smp
 
 %files
 %defattr(644,root,root,755)
-%doc %{_orig_name}.7 README ldistrib.txt
-/lib/modules/%{_kernel_ver}/misc/*
+%doc e1000.7 README ldistrib.txt
+/lib/modules/%{_kernel_ver}/kernel/drivers/net/*
 
-%files -n kernel-smp-net-%{_orig_name}
+%if %{with smp} && %{with dist_kernel}
+%files -n kernel%{_alt_kernel}-smp-net-e1000
 %defattr(644,root,root,755)
-%doc %{_orig_name}.7 README ldistrib.txt
-/lib/modules/%{_kernel_ver}smp/misc/*
+%doc e1000.7 README ldistrib.txt
+/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/*
+%endif