SPECS (Titanium): kernel-bare-vserver.spec - - arch dir and %files...
hawk
hawk at pld-linux.org
Mon Apr 21 11:05:42 CEST 2008
Author: hawk Date: Mon Apr 21 09:05:42 2008 GMT
Module: SPECS Tag: Titanium
---- Log message:
- - arch dir and %files adjustements for 2.6.24
---- Files affected:
SPECS:
kernel-bare-vserver.spec (1.1.2.23 -> 1.1.2.24)
---- Diffs:
================================================================
Index: SPECS/kernel-bare-vserver.spec
diff -u SPECS/kernel-bare-vserver.spec:1.1.2.23 SPECS/kernel-bare-vserver.spec:1.1.2.24
--- SPECS/kernel-bare-vserver.spec:1.1.2.23 Mon Apr 21 08:49:36 2008
+++ SPECS/kernel-bare-vserver.spec Mon Apr 21 11:05:36 2008
@@ -105,6 +105,7 @@
# No ELF objects there to strip (skips processing 27k files)
%define _noautostrip .*%{_kernelsrcdir}/.*
+%define x86_target_base_arch x86
%define initrd_dir /boot
# kernel release (used in filesystem and eventually in uname -r)
@@ -375,6 +376,11 @@
sed -i -e '/select INPUT/d' net/bluetooth/hidp/Kconfig
+# 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
+
# remove unwanted files after patching (if any)
find . '(' -name '*~' -o -name '*.orig' -o -name '.gitignore' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -421,7 +427,7 @@
BuildConfig() {
%{?debug:set -x}
%ifarch %{ix86}
- Config="x86"
+ Config="%{x86_target_base_arch}"
%else
Config="%{_target_base_arch}"
%endif
@@ -446,7 +452,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/%{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
@@ -454,7 +460,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/%{x86_target_base_arch}/defconfig
}
BuildKernel() {
@@ -462,7 +468,7 @@
echo "Building kernel ..."
%{__make} %{MakeOpts} mrproper \
RCS_FIND_IGNORE='-name build-done -prune -o'
- install arch/%{_target_base_arch}/defconfig .config
+ install arch/%{x86_target_base_arch}/defconfig .config
%{__make} %{MakeOpts} clean \
RCS_FIND_IGNORE='-name build-done -prune -o'
@@ -476,7 +482,7 @@
PreInstallKernel() {
%ifarch %{ix86}
- Config="x86"
+ Config="%{x86_target_base_arch}"
%else
Config="%{_target_base_arch}"
%endif
@@ -485,7 +491,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_target_base_arch}/boot/bzImage $KERNEL_INSTALL_DIR/boot/vmlinuz-$KernelVer
%endif
install vmlinux $KERNEL_INSTALL_DIR/boot/vmlinux-$KernelVer
@@ -666,7 +672,6 @@
/lib/modules/%{kernel_release}/kernel/kernel
/lib/modules/%{kernel_release}/kernel/lib
/lib/modules/%{kernel_release}/kernel/net
-/lib/modules/%{kernel_release}/kernel/security
%dir /lib/modules/%{kernel_release}/kernel/sound
/lib/modules/%{kernel_release}/kernel/sound/soundcore.*
%if %{have_sound}
@@ -784,6 +789,7 @@
%{_kernelsrcdir}/lib
%{_kernelsrcdir}/mm
%{_kernelsrcdir}/net
+%{_kernelsrcdir}/samples
%{_kernelsrcdir}/scripts/*
%exclude %{_kernelsrcdir}/scripts/Kbuild.include
%exclude %{_kernelsrcdir}/scripts/Makefile*
@@ -810,6 +816,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.1.2.24 2008-04-21 09:05:36 hawk
+- - arch dir and %files adjustements for 2.6.24
+
Revision 1.1.2.23 2008-04-21 06:49:36 hawk
- /boot symlinks fix, dropped creating *.old file
- cleanup, cosmetics
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-bare-vserver.spec?r1=1.1.2.23&r2=1.1.2.24&f=u
More information about the pld-cvs-commit
mailing list