SPECS (Titanium): kernel-bare-grsecurity.spec - started update to ...
hawk
hawk at pld-linux.org
Thu Feb 28 13:15:29 CET 2008
Author: hawk Date: Thu Feb 28 12:15:29 2008 GMT
Module: SPECS Tag: Titanium
---- Log message:
- started update to 2.6.24.3
- arch dir adjustements
---- Files affected:
SPECS:
kernel-bare-grsecurity.spec (1.1.2.17 -> 1.1.2.18)
---- Diffs:
================================================================
Index: SPECS/kernel-bare-grsecurity.spec
diff -u SPECS/kernel-bare-grsecurity.spec:1.1.2.17 SPECS/kernel-bare-grsecurity.spec:1.1.2.18
--- SPECS/kernel-bare-grsecurity.spec:1.1.2.17 Mon Feb 11 12:26:00 2008
+++ SPECS/kernel-bare-grsecurity.spec Thu Feb 28 13:15:24 2008
@@ -46,9 +46,9 @@
%define alt_kernel bare-grsecurity
%endif
-%define _basever 2.6.23
-%define _postver .16
-%define _rel 1
+%define _basever 2.6.24
+%define _postver .3
+%define _rel 0.1
# for rc kernels basever is the version patch (source1) should be applied to
#%define _ver 2.6.20
@@ -68,10 +68,10 @@
License: GPL v2
Group: Base/Kernel
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{_basever}.tar.bz2
-# Source0-md5: 2cc2fd4d521dc5d7cfce0d8a9d1b3472
+# Source0-md5: 3f23ad4b69d0a552042d1ed0f4399857
%if "%{_postver}" != "%{nil}"
Source1: http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{_basever}%{_postver}.bz2
-# Source1-md5: b74a13d4c054e565d453615f70c9b1e9
+# Source1-md5: 4c42be33a7d98f280588c9d28478cdfd
%endif
%if "%{_ver}" != "%{nil}"
Source10: http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-%{_ver}-%{_rc}.bz2
@@ -89,9 +89,9 @@
# from http://www.grsecurity.net/~spender/
Patch100: linux-2.6-grsecurity.patch
# from squashfs: http://dl.sourceforge.net/sourceforge/squashfs/squashfs3.3.tar.gz for linux-2.6.23
-Patch101: linux-2.6-squashfs.patch
+Patch101: linux-2.6.24-squashfs.patch
# official vendor driver for Marvell Yukon gigabit adapters, v10.22.4.3
-Patch102: linux-2.6-sk98lin.patch
+Patch102: linux-2.6.24-sk98lin.patch
URL: http://www.kernel.org/
BuildRequires: binutils >= 3:2.14.90.0.7
@@ -135,6 +135,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)
@@ -404,6 +405,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
@@ -461,7 +467,7 @@
BuildConfig() {
%{?debug:set -x}
%ifarch %{ix86}
- Config="x86"
+ Config="%{x86_target_base_arch}"
%else
Config="%{_target_base_arch}"
%endif
@@ -491,7 +497,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
@@ -499,7 +505,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() {
@@ -507,7 +513,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'
@@ -521,7 +527,7 @@
PreInstallKernel() {
%ifarch %{ix86}
- Config="x86"
+ Config="%{x86_target_base_arch}"
%else
Config="%{_target_base_arch}"
%endif
@@ -530,7 +536,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
@@ -726,7 +732,7 @@
/lib/modules/%{kernel_release}/kernel/kernel
/lib/modules/%{kernel_release}/kernel/lib
/lib/modules/%{kernel_release}/kernel/net
-/lib/modules/%{kernel_release}/kernel/security
+#/lib/modules/%{kernel_release}/kernel/security
%dir /lib/modules/%{kernel_release}/kernel/sound
/lib/modules/%{kernel_release}/kernel/sound/soundcore.*
%if %{have_sound}
@@ -847,6 +853,7 @@
%{_kernelsrcdir}/lib
%{_kernelsrcdir}/mm
%{_kernelsrcdir}/net
+%{_kernelsrcdir}/samples
%{_kernelsrcdir}/scripts/*
%exclude %{_kernelsrcdir}/scripts/Kbuild.include
%exclude %{_kernelsrcdir}/scripts/Makefile*
@@ -873,6 +880,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.1.2.18 2008-02-28 12:15:24 hawk
+- started update to 2.6.24.3
+- arch dir adjustements
+
Revision 1.1.2.17 2008-02-11 11:26:00 hawk
- updated to 2.6.23.16, official fix for local root hole
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-bare-grsecurity.spec?r1=1.1.2.17&r2=1.1.2.18&f=u
More information about the pld-cvs-commit
mailing list