SPECS (LINUX_2_6): kernel.spec - please don't break Makefiles; mak...

[zbyniu]

Author: zbyniu                       Date: Mon Apr 21 13:54:36 2008 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- please don't break Makefiles; make archclean is the way

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1875 -> 1.441.2.1876) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1875 SPECS/kernel.spec:1.441.2.1876
--- SPECS/kernel.spec:1.441.2.1875	Mon Apr 21 12:34:19 2008
+++ SPECS/kernel.spec	Mon Apr 21 15:54:30 2008
@@ -994,11 +994,6 @@
 # on sparc64 avoid building break due to NULL pointer type warrning
 sed -i -e 's/^EXTRA_CFLAGS := -Werror/EXTRA_CFLAGS := /' arch/sparc64/kernel/Makefile
 
-# Kill creating obsolete arch/{i386,x86_64}/boot directories
-# and bzImage symlinks, breaks rpm directory deps
-sed -i -e '/\/arch\/i386\/boot/d' arch/x86/Makefile_32
-sed -i -e '/\/arch\/x86_64\/boot/d' arch/x86/Makefile_64
-
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' -o -name '.gitignore' ')' -print0 | xargs -0 -r -l512 rm -f
 
@@ -1285,7 +1280,7 @@
 	mkdir -p $KERNEL_INSTALL_DIR/boot
 	install System.map $KERNEL_INSTALL_DIR/boot/System.map-$KernelVer
 %ifarch %{ix86} %{x8664}
-	install arch/%{_target_base_arch}/boot/bzImage $KERNEL_INSTALL_DIR/boot/vmlinuz-$KernelVer
+	install arch/x86/boot/bzImage $KERNEL_INSTALL_DIR/boot/vmlinuz-$KernelVer
 	install vmlinux $KERNEL_INSTALL_DIR/boot/vmlinux-$KernelVer
 %endif
 %ifarch alpha sparc sparc64
@@ -1376,7 +1371,7 @@
 
 cd $RPM_BUILD_ROOT%{_kernelsrcdir}
 
-%{__make} %CrossOpts mrproper \
+%{__make} %CrossOpts mrproper archclean \
 	RCS_FIND_IGNORE='-name build-done -prune -o'
 
 if [ -e $KERNEL_BUILD_DIR/build-done/kernel%{_kernelsrcdir}/include/linux/autoconf-dist.h ]; then
@@ -1404,9 +1399,6 @@
 # ghosted initrd
 touch $RPM_BUILD_ROOT/boot/initrd-%{kernel_release}.gz
 
-# remove unnecessary dir with dead symlink
-rm -rf $RPM_BUILD_ROOT%{_kernelsrcdir}/arch/i386
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -1705,6 +1697,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1876  2008-04-21 13:54:30  zbyniu
+- please don't break Makefiles; make archclean is the way
+
 Revision 1.441.2.1875  2008-04-21 10:34:19  hawk
 - killed creating arch/{i386,x86_64}/boot symlinks in makefiles, causes broken
   directory deps in -source subpackage
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.1875&r2=1.441.2.1876&f=u