Author: glen Date: Mon Jan 28 18:28:08 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- follow kernel.spec changes
---- Files affected:
SPECS:
kernel-vanilla.spec (1.65 -> 1.66)
---- Diffs:
================================================================
Index: SPECS/kernel-vanilla.spec
diff -u SPECS/kernel-vanilla.spec:1.65 SPECS/kernel-vanilla.spec:1.66
--- SPECS/kernel-vanilla.spec:1.65 Mon Jan 28 18:39:11 2008
+++ SPECS/kernel-vanilla.spec Mon Jan 28 19:28:03 2008
@@ -131,9 +131,9 @@
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%ifarch %{ix86} %{x8664}
-%define target_base_arch_dir x86
+%define target_arch_dir x86
%else
-%define target_base_arch_dir %{_target_base_arch}
+%define target_arch_dir %{_target_base_arch}
%endif
# No ELF objects there to strip (skips processing 27k files)
@@ -462,36 +462,36 @@
echo "Building config file [using $Config.conf] ..."
- > arch/%{target_base_arch_dir}/defconfig
+ > arch/%{target_arch_dir}/defconfig
./kernel-config.py %{_target_base_arch}
$RPM_SOURCE_DIR/kernel-vanilla-multiarch.conf \
- arch/%{target_base_arch_dir}/defconfig
arch/%{target_base_arch_dir}/defconfig
+ arch/%{target_arch_dir}/defconfig
arch/%{target_base_arch_dir}/defconfig
- echo "CONFIG_LOCALVERSION=\"-%{_localversion}smp\"" >>
arch/%{target_base_arch_dir}/defconfig
+ echo "CONFIG_LOCALVERSION=\"-%{_localversion}smp\"" >>
arch/%{target_arch_dir}/defconfig
- TuneUpConfigForIX86 arch/%{target_base_arch_dir}/defconfig
+ TuneUpConfigForIX86 arch/%{target_arch_dir}/defconfig
%if %{with preempt-nort}
./kernel-config.py %{_target_base_arch}
$RPM_SOURCE_DIR/kernel-vanilla-preempt-nort.config \
- arch/%{target_base_arch_dir}/defconfig
arch/%{target_base_arch_dir}/defconfig
+ arch/%{target_arch_dir}/defconfig
arch/%{target_base_arch_dir}/defconfig
%else
./kernel-config.py %{_target_base_arch}
$RPM_SOURCE_DIR/kernel-vanilla-no-preempt-nort.config \
- arch/%{target_base_arch_dir}/defconfig
arch/%{target_base_arch_dir}/defconfig
+ arch/%{target_arch_dir}/defconfig
arch/%{target_base_arch_dir}/defconfig
%endif
./kernel-config.py %{_target_base_arch}
$RPM_SOURCE_DIR/kernel-vanilla-netfilter.config \
- arch/%{target_base_arch_dir}/defconfig
arch/%{target_base_arch_dir}/defconfig
+ arch/%{target_arch_dir}/defconfig
arch/%{target_base_arch_dir}/defconfig
-%{?debug:sed -i "s:# CONFIG_DEBUG_SLAB is not set:CONFIG_DEBUG_SLAB=y:"
arch/%{target_base_arch_dir}/defconfig}
-%{?debug:sed -i "s:# CONFIG_DEBUG_PREEMPT is not set:CONFIG_DEBUG_PREEMPT=y:"
arch/%{target_base_arch_dir}/defconfig}
-%{?debug:sed -i "s:# CONFIG_RT_DEADLOCK_DETECT is not
set:CONFIG_RT_DEADLOCK_DETECT=y:" arch/%{target_base_arch_dir}/defconfig}
+%{?debug:sed -i "s:# CONFIG_DEBUG_SLAB is not set:CONFIG_DEBUG_SLAB=y:"
arch/%{target_arch_dir}/defconfig}
+%{?debug:sed -i "s:# CONFIG_DEBUG_PREEMPT is not set:CONFIG_DEBUG_PREEMPT=y:"
arch/%{target_arch_dir}/defconfig}
+%{?debug:sed -i "s:# CONFIG_RT_DEADLOCK_DETECT is not
set:CONFIG_RT_DEADLOCK_DETECT=y:" arch/%{target_arch_dir}/defconfig}
- ln -sf arch/%{target_base_arch_dir}/defconfig .config
+ ln -sf arch/%{target_arch_dir}/defconfig .config
install -d $KERNEL_INSTALL_DIR%{_kernelsrcdir}/include/linux
rm -f include/linux/autoconf.h
%{__make} %{MakeOpts} include/linux/autoconf.h
install include/linux/autoconf.h \
$KERNEL_INSTALL_DIR%{_kernelsrcdir}/include/linux/autoconf-dist.h
- install arch/%{target_base_arch_dir}/defconfig \
+ install arch/%{target_arch_dir}/defconfig \
$KERNEL_INSTALL_DIR%{_kernelsrcdir}/config-dist
}
@@ -500,7 +500,7 @@
echo "Building kernel $1 ..."
%{__make} %{MakeOpts} mrproper \
RCS_FIND_IGNORE='-name build-done -prune -o'
- ln -sf arch/%{target_base_arch_dir}/defconfig .config
+ ln -sf arch/%{target_arch_dir}/defconfig .config
%{__make} %{MakeOpts} clean \
RCS_FIND_IGNORE='-name build-done -prune -o'
@@ -518,7 +518,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_dir}/boot/bzImage
$KERNEL_INSTALL_DIR/boot/vmlinuz-$KernelVer
+ install arch/%{target_arch_dir}/boot/bzImage
$KERNEL_INSTALL_DIR/boot/vmlinuz-$KernelVer
%endif
%ifarch ppc
@@ -861,6 +861,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.66 2008-01-28 18:28:03 glen
+- follow kernel.spec changes
+
Revision 1.65 2008-01-28 17:39:11 glen
- update multiarch.py mode
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-vanilla.spec?r1=1.65&r2=1.66&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
