SPECS (Titanium): kernel-vanilla.spec - more s/i386/x86/ fixes

[hawk]

Author: hawk                         Date: Mon Jan 28 19:51:30 2008 GMT
Module: SPECS                         Tag: Titanium
---- Log message:
- more s/i386/x86/ fixes

---- Files affected:
SPECS:
   kernel-vanilla.spec (1.43.2.11.2.17 -> 1.43.2.11.2.18) 

---- Diffs:

================================================================
Index: SPECS/kernel-vanilla.spec
diff -u SPECS/kernel-vanilla.spec:1.43.2.11.2.17 SPECS/kernel-vanilla.spec:1.43.2.11.2.18
--- SPECS/kernel-vanilla.spec:1.43.2.11.2.17	Mon Jan 28 20:18:13 2008
+++ SPECS/kernel-vanilla.spec	Mon Jan 28 20:51:25 2008
@@ -121,7 +121,7 @@
 # No ELF objects there to strip (skips processing 27k files)
 %define		_noautostrip	.*%{_kernelsrcdir}/.*
 
-%define		target_base_arch_dir	x86
+%define		x86_target_base_arch	x86
 %define		initrd_dir		/boot
 
 # kernel release (used in filesystem and eventually in uname -r)
@@ -432,7 +432,11 @@
 rm -f .config
 BuildConfig() {
 	%{?debug:set -x}
+%ifarch %{ix86}
+	Config="%{x86_target_base_arch}"
+%else
 	Config="%{_target_base_arch}"
+%endif
 	KernelVer=%{kernel_release}
 
 	echo "Building config file [using $Config.conf] for KERNEL ..."
@@ -454,7 +458,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_dir}/defconfig
+	install .config arch/%{x86_target_base_arch}/defconfig
 	install -d $KERNEL_INSTALL_DIR%{_kernelsrcdir}/include/linux
 	rm -f include/linux/autoconf.h
 	%{__make} %{MakeOpts} include/linux/autoconf.h
@@ -462,7 +466,7 @@
 		$KERNEL_INSTALL_DIR%{_kernelsrcdir}/include/linux/autoconf-dist.h
 	install .config \
 		$KERNEL_INSTALL_DIR%{_kernelsrcdir}/config-dist
-	install .config arch/%{target_base_arch_dir}/defconfig
+	install .config arch/%{x86_target_base_arch}/defconfig
 }
 
 BuildKernel() {
@@ -470,7 +474,7 @@
 	echo "Building kernel ..."
 	%{__make} %{MakeOpts} mrproper \
 		RCS_FIND_IGNORE='-name build-done -prune -o'
-	install arch/%{target_base_arch_dir}/defconfig .config
+	install arch/%{x86_target_base_arch}/defconfig .config
 
 	%{__make} %{MakeOpts} clean \
 		RCS_FIND_IGNORE='-name build-done -prune -o'
@@ -483,13 +487,17 @@
 }
 
 PreInstallKernel() {
+%ifarch %{ix86}
+	Config="%{x86_target_base_arch}"
+%else
 	Config="%{_target_base_arch}"
+%endif
 	KernelVer=%{kernel_release}
 
 	mkdir -p $KERNEL_INSTALL_DIR/boot
 	install System.map $KERNEL_INSTALL_DIR/boot/System.map-$KernelVer
 %ifarch %{ix86} %{x8664}
-	install arch/%%{target_base_arch_dir}/boot/bzImage $KERNEL_INSTALL_DIR/boot/vmlinuz-$KernelVer
+	install arch/%%{x86_target_base_arch}/boot/bzImage $KERNEL_INSTALL_DIR/boot/vmlinuz-$KernelVer
 %endif
 
 	install vmlinux $KERNEL_INSTALL_DIR/boot/vmlinux-$KernelVer
@@ -832,6 +840,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.43.2.11.2.18  2008-01-28 19:51:25  hawk
+- more s/i386/x86/ fixes
+
 Revision 1.43.2.11.2.17  2008-01-28 19:18:13  hawk
 - updated x86 config source name
 
================================================================

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