- make build with new kernel-module-buid (2.6.14.7-1)

- rel 4.1, please test and if ok give full release and STBR

Changed files:
    bcm5700.spec -> 1.49

diff --git a/bcm5700.spec b/bcm5700.spec
index 6d3b31d26103b9cd6d08ed8fa002db8c3dd53133..bf163e000d486855b5a0ef94eb3730412299fc21 100644 (file)
--- a/bcm5700.spec
+++ b/bcm5700.spec
@@ -18,7 +18,7 @@ Summary:      Linux driver for the Broadcom's NetXtreme BCM57xx Network Interface Car
 Summary(pl):   Sterownik dla Linuksa do kart sieciowych Broadcom NetXtreme BCM57xx
 Name:          bcm5700
 Version:       8.2.18
-%define                _rel    4
+%define                _rel    4.1
 Release:       %{_rel}
 License:       GPL v2
 Group:         Base/Kernel
@@ -84,25 +84,17 @@ 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
-%ifarch ppc ppc64
-        install -d include/asm
-        [ ! -d %{_kernelsrcdir}/include/asm-powerpc ] || ln -sf %{_kernelsrcdir}/include/asm-powerpc/* include/asm
-        [ ! -d %{_kernelsrcdir}/include/asm-%{_target_base_arch} ] || ln -snf %{_kernelsrcdir}/include/asm-%{_target_base_arch}/* include/asm
-%else
-        ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
-%endif
-       ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
-       touch include/config/MARKER
+       install -d o/include/linux
+       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
+       %{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
 
        install %{SOURCE1} Makefile
 
        %{__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 \
                %{?debug:DBG=1} \
@@ -112,7 +104,7 @@ for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}
 %endif
                 HOSTCC="%{__cc}" \
                CPP="%{__cpp}" \
-               M=$PWD O=$PWD \
+               M=$PWD O=$PWD/o \
                %{?with_verbose:V=1}
 
        mv bcm5700{,-$cfg}.ko