SPECS (LINUX_2_6): kernel.spec - fixed %install.

[cieciwa]

Author: cieciwa                      Date: Fri Nov 17 13:11:38 2006 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- fixed %install.

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1658 -> 1.441.2.1659) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1658 SPECS/kernel.spec:1.441.2.1659
--- SPECS/kernel.spec:1.441.2.1658	Mon Nov 13 16:53:03 2006
+++ SPECS/kernel.spec	Fri Nov 17 14:11:32 2006
@@ -951,6 +951,10 @@
 # on sparc this line causes CONFIG_INPUT=m (instead of =y), thus breaking build
 sed -i -e '/select INPUT/d' net/bluetooth/hidp/Kconfig
 
+# cleanup backups after patching
+find . '(' -name '*~' -o -name '*.orig' -o -name '.gitignore' ')' -print0 | xargs -0 -r -l512 rm -f
+
+%build
 TuneUpConfigForIX86 () {
 	set -x
 %ifarch %{ix86}
@@ -1087,26 +1091,8 @@
 	fi
 }
 
-## Prepare configs:
-KERNEL_BUILD_DIR=`pwd`
-# UP KERNEL
-KERNEL_INSTALL_DIR="$KERNEL_BUILD_DIR/build-done/kernel-UP"
-rm -rf $KERNEL_INSTALL_DIR
-%if %{with up}
-BuildConfig
-%endif
-
-# SMP KERNEL
-KERNEL_INSTALL_DIR="$KERNEL_BUILD_DIR/build-done/kernel-SMP"
-rm -rf $KERNEL_INSTALL_DIR
-%if %{with smp}
-BuildConfig smp
-%endif
 
-# cleanup backups after patching
-find . '(' -name '*~' -o -name '*.orig' -o -name '.gitignore' ')' -print0 | xargs -0 -r -l512 rm -f
 
-%build
 BuildKernel() {
 	%{?debug:set -x}
 	echo "Building kernel $1 ..."
@@ -1220,6 +1206,7 @@
 %{__make} %CrossOpts include/linux/utsrelease.h
 cp include/linux/utsrelease.h{,.save}
 %if %{with up}
+BuildConfig
 BuildKernel
 PreInstallKernel
 %endif
@@ -1228,6 +1215,7 @@
 KERNEL_INSTALL_DIR="$KERNEL_BUILD_DIR/build-done/kernel-SMP"
 rm -rf $KERNEL_INSTALL_DIR
 %if %{with smp}
+BuildConfig smp
 BuildKernel smp
 PreInstallKernel smp
 %endif
@@ -1281,7 +1269,7 @@
 
 %if %{with up} || %{with smp}
 # UP or SMP
-install $KERNEL_BUILD_DIR/include/linux/* \
+cp -Rdp $KERNEL_BUILD_DIR/include/linux/* \
 	$RPM_BUILD_ROOT/usr/src/linux-%{version}/include/linux
 %endif
 
@@ -1764,6 +1752,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1659  2006/11/17 13:11:32  cieciwa
+- fixed %install.
+
 Revision 1.441.2.1658  2006/11/13 15:53:03  sparky
 - don't use %{without ...}, it may not work after inverting bcond
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1658&r2=1.441.2.1659&f=u