SPECS (Titanium): kernel-vanilla.spec - fixed arch dir (x86 and x8...

[hawk]

Author: hawk                         Date: Mon Jan 28 18:42:56 2008 GMT
Module: SPECS                         Tag: Titanium
---- Log message:
- fixed arch dir (x86 and x86_64 were merged)

---- Files affected:
SPECS:
   kernel-vanilla.spec (1.43.2.11.2.15 -> 1.43.2.11.2.16) 

---- Diffs:

================================================================
Index: SPECS/kernel-vanilla.spec
diff -u SPECS/kernel-vanilla.spec:1.43.2.11.2.15 SPECS/kernel-vanilla.spec:1.43.2.11.2.16
--- SPECS/kernel-vanilla.spec:1.43.2.11.2.15	Mon Jan 28 16:51:21 2008
+++ SPECS/kernel-vanilla.spec	Mon Jan 28 19:42:51 2008
@@ -121,7 +121,8 @@
 # No ELF objects there to strip (skips processing 27k files)
 %define		_noautostrip	.*%{_kernelsrcdir}/.*
 
-%define		initrd_dir	/boot
+%define		target_base_arch_dir	x86
+%define		initrd_dir		/boot
 
 # kernel release (used in filesystem and eventually in uname -r)
 # modules will be looked from /lib/modules/%{kernel_release}
@@ -453,7 +454,7 @@
 %{?debug:sed -i "s:# CONFIG_DEBUG_PREEMPT is not set:CONFIG_DEBUG_PREEMPT=y:" .config}
 %{?debug:sed -i "s:# CONFIG_RT_DEADLOCK_DETECT is not set:CONFIG_RT_DEADLOCK_DETECT=y:" .config}
 
-	install .config arch/%{_target_base_arch}/defconfig
+	install .config arch/%{target_base_arch_dir}/defconfig
 	install -d $KERNEL_INSTALL_DIR%{_kernelsrcdir}/include/linux
 	rm -f include/linux/autoconf.h
 	%{__make} %{MakeOpts} include/linux/autoconf.h
@@ -461,7 +462,7 @@
 		$KERNEL_INSTALL_DIR%{_kernelsrcdir}/include/linux/autoconf-dist.h
 	install .config \
 		$KERNEL_INSTALL_DIR%{_kernelsrcdir}/config-dist
-	install .config arch/%{_target_base_arch}/defconfig
+	install .config arch/%{target_base_arch_dir}/defconfig
 }
 
 BuildKernel() {
@@ -469,7 +470,7 @@
 	echo "Building kernel ..."
 	%{__make} %{MakeOpts} mrproper \
 		RCS_FIND_IGNORE='-name build-done -prune -o'
-	install arch/%{_target_base_arch}/defconfig .config
+	install arch/%{target_base_arch_dir}/defconfig .config
 
 	%{__make} %{MakeOpts} clean \
 		RCS_FIND_IGNORE='-name build-done -prune -o'
@@ -488,7 +489,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/%%{target_base_arch_dir}/boot/bzImage $KERNEL_INSTALL_DIR/boot/vmlinuz-$KernelVer
 %endif
 
 	install vmlinux $KERNEL_INSTALL_DIR/boot/vmlinux-$KernelVer
@@ -831,6 +832,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.43.2.11.2.16  2008-01-28 18:42:51  hawk
+- fixed arch dir (x86 and x86_64 were merged)
+
 Revision 1.43.2.11.2.15  2008-01-28 15:51:21  hawk
 - 2.6.24, fetch sources only, NFY
 
================================================================

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