From 01be40424d3b5af0f6fb70c4de23b52adfff5b42 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C5=82awomir=20Paszkiewicz?= Date: Sun, 13 Nov 2005 13:33:58 +0000 Subject: [PATCH] - fixed build on ppc and sparc (copy->paste arekm`s and sparky`s changes from shfs.spec) - release 1 Changed files: e1000.spec -> 1.41 --- e1000.spec | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/e1000.spec b/e1000.spec index 9393def..890fc58 100644 --- a/e1000.spec +++ b/e1000.spec @@ -8,7 +8,7 @@ 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 0.1 +%define _rel 1 Release: %{_rel}@%{_kernel_ver_str} License: GPL v2 Vendor: Intel Corporation @@ -18,6 +18,9 @@ Source0: ftp://aiedownload.intel.com/df-support/9180/eng/e1000-%{version}.tar.gz 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 Requires(post,postun): /sbin/depmod %if %{with dist_kernel} %requires_releq_kernel_up @@ -28,6 +31,11 @@ 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. @@ -71,7 +79,17 @@ for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist} install -d include/{linux,config} ln -sf %{_kernelsrcdir}/config-$cfg .config ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h 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 + else + ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm + fi +%else ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm +%endif ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers touch include/config/MARKER @@ -85,6 +103,11 @@ EOF M=$PWD O=$PWD \ %{?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' \ CC="%{__cc}" CPP="%{__cpp}" \ M=$PWD O=$PWD \ -- 2.43.0