- make it build on 2.6.16.1

[packages/e1000.git] / e1000.spec

diff --git a/e1000.spec b/e1000.spec
index 7af5a1aafa11b6a4a06e63efd3446978c837e529..81ba8a9630225f36d1ade96807b0023890a1f4a5 100644 (file)
--- a/e1000.spec
+++ b/e1000.spec
@@ -67,32 +67,32 @@ 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
+               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
+cat >o/Makefile <<EOF
 obj-m := e1000i.o
 e1000i-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 \
+               M=$PWD O=$PWD/o \
                %{?with_verbose:V=1}
        %{__make} -C %{_kernelsrcdir} modules \
 %if "%{_target_base_arch}" != "%{_arch}"
@@ -101,10 +101,10 @@ EOF
 %endif
                 HOSTCC="%{__cc}" \
                EXTRA_CFLAGS='-DE1000_NAPI' \
-               M=$PWD O=$PWD \
+               M=$PWD O=$PWD/o \
                %{?with_verbose:V=1}
 
-       mv e1000i{,-$cfg}.ko
+       mv e1000{,i-$cfg}.ko
 done
 
 %install