Author: adamg Date: Thu Apr 6 15:06:08 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- make it build on 2.6.16.1
---- Files affected:
SPECS:
kernel-net-e1000.spec (1.43 -> 1.44)
---- Diffs:
================================================================
Index: SPECS/kernel-net-e1000.spec
diff -u SPECS/kernel-net-e1000.spec:1.43 SPECS/kernel-net-e1000.spec:1.44
--- SPECS/kernel-net-e1000.spec:1.43 Sat Dec 10 16:06:55 2005
+++ SPECS/kernel-net-e1000.spec Thu Apr 6 17:06:02 2006
@@ -68,32 +68,32 @@
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}"
@@ -102,10 +102,10 @@
%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
@@ -154,6 +154,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.44 2006/04/06 15:06:02 adamg
+- make it build on 2.6.16.1
+
Revision 1.43 2005/12/10 15:06:55 qboosh
- no more sparc->sparc64
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/kernel-net-e1000.spec?r1=1.43&r2=1.44&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
