Author: glen Date: Mon Jan 28 15:27:54 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- ix86, x86_64 arch dirs got merged in source
---- Files affected:
SPECS:
kernel-vanilla.spec (1.62 -> 1.63)
---- Diffs:
================================================================
Index: SPECS/kernel-vanilla.spec
diff -u SPECS/kernel-vanilla.spec:1.62 SPECS/kernel-vanilla.spec:1.63
--- SPECS/kernel-vanilla.spec:1.62 Mon Jan 28 16:06:39 2008
+++ SPECS/kernel-vanilla.spec Mon Jan 28 16:27:48 2008
@@ -129,6 +129,12 @@
ExclusiveOS: Linux
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%ifarch %{ix86} %{x8664}
+%define target_base_arch_dir x86
+%else
+%define target_base_arch_dir %{_target_base_arch}
+%endif
+
# No ELF objects there to strip (skips processing 27k files)
%define _noautostrip .*%{_kernelsrcdir}/.*
@@ -470,7 +476,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
@@ -478,7 +484,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() {
@@ -486,7 +492,7 @@
echo "Building kernel $1 ..."
%{__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'
@@ -504,7 +510,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
%ifarch ppc
@@ -847,6 +853,8 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.63 2008-01-28 15:27:48 glen
+- ix86, x86_64 arch dirs got merged in source
+
Revision 1.62 2008-01-28 15:06:39 glen
- start 2.6.24
-
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-vanilla.spec?r1=1.62&r2=1.63&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
