SPECS (LINUX_2_6_16): kernel.spec - addedd Linux-ABI support. Bcon...

[marcus]

Author: marcus                       Date: Tue Feb 26 09:47:29 2008 GMT
Module: SPECS                         Tag: LINUX_2_6_16
---- Log message:
- addedd Linux-ABI support. Bcond, default disabled.

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1558.2.143 -> 1.441.2.1558.2.144) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1558.2.143 SPECS/kernel.spec:1.441.2.1558.2.144
--- SPECS/kernel.spec:1.441.2.1558.2.143	Mon Feb 18 16:37:08 2008
+++ SPECS/kernel.spec	Tue Feb 26 10:47:23 2008
@@ -29,7 +29,8 @@
 %bcond_with	pae		# build PAE (HIGHMEM64G) support on uniprocessor
 %bcond_with	nfsroot		# build with root on NFS support
 %bcond_with	reiserfs4	# build with ReiserFS 4 support
-%bcond_with	ext2compiled		# compile ext2 into kernel to be able to boot from ext2 rootfs
+%bcond_with	ext2compiled	# compile ext2 into kernel to be able to boot from ext2 rootfs
+%bcond_with     abi             # build ABI support only ix86 !!
 
 %{?debug:%define with_verbose 1}
 
@@ -82,6 +83,10 @@
 %define		have_oss	0
 %endif
 
+%ifnarch %{ix86}
+%undefine       abi
+%endif
+
 %if %{with xen0}
 %define		xen	xen0
 %define		dashxen	\-xen0
@@ -196,6 +201,7 @@
 Source48:	kernel-xen-extra.config
 Source49:	kernel-grsec+pax.config
 Source50:	kernel-openswan.config
+Source51:	kernel-abi.config
 ###
 #	Patches
 ###
@@ -256,6 +262,9 @@
 #	End netfilter
 ###
 
+# from http://ace-host.stuart.id.au/russell/files/debian/sarge/kernel-patch-linuxabi/kernel-patch-linuxabi_20060404.tar.gz
+Patch40:	linuxabi-2.6.16-0.patch
+
 # derived from http://dl.sourceforge.net/l7-filter/netfilter-layer7-v2.2.tar.gz
 Patch49:	kernel-2.6.13-2.6.16-layer7-2.2.patch
 
@@ -478,6 +487,7 @@
 %{?with_xenU:Xen U - enabled}
 %{?with_vesafb_tng:VesaFB New generation - enabled}
 %{?with_nfsroot:Root on NFS - enabled}
+%{?with_abi:Linux ABI support - enabled}
 
 %package vmlinux
 Summary:	vmlinux - uncompressed kernel image
@@ -629,6 +639,7 @@
 %{?with_xenU:Xen U - enabled}
 %{?with_vesafb_tng:VesaFB New generation - enabled}
 %{?with_nfsroot:Root on NFS - enabled}
+%{?with_abi:Linux ABI support - enabled}
 
 %description smp -l fr.UTF-8
 Ce package inclu une version SMP du noyau de Linux version {version}.
@@ -642,6 +653,7 @@
 %{?with_xenU:Xen U - enabled}
 %{?with_vesafb_tng:VesaFB New generation - enabled}
 %{?with_nfsroot:Root on NFS - enabled}
+%{?with_abi:Linux ABI support - enabled}
 
 %description smp -l pl.UTF-8
 Pakiet zawiera jądro SMP Linuksa w wersji %{version}. Jest ono
@@ -655,6 +667,7 @@
 %{?with_xenU:Xen U - enabled}
 %{?with_vesafb_tng:VesaFB New generation - enabled}
 %{?with_nfsroot:Root on NFS - enabled}
+%{?with_abi:Linux ABI support - enabled}
 
 %package smp-vmlinux
 Summary:	vmlinux - uncompressed SMP kernel image
@@ -892,6 +905,10 @@
 ##
 # end of netfilter
 
+%if %{with abi}
+%patch40 -p1
+%endif
+
 %patch49 -p1
 
 %patch50 -p1
@@ -1080,6 +1097,10 @@
 	# IPSEC KLIPS
 	cat %{SOURCE50} >> arch/%{_target_base_arch}/defconfig
 
+%if %{with abi}
+	cat %{SOURCE51} >> arch/%{_target_base_arch}/defconfig
+%endif
+
 %if %{with xen0} || %{with xenU}
 	sed -i "s:CONFIG_X86_PC=y:# CONFIG_X86_PC is not set:" arch/%{_target_base_arch}/defconfig
 	sed -i "s:CONFIG_RIO=[ym]:# CONFIG_RIO is not set:" arch/%{_target_base_arch}/defconfig
@@ -1802,6 +1823,9 @@
 %{_kernelsrcdir}/arch/*/kernel/[!M]*
 %exclude %{_kernelsrcdir}/arch/*/kernel/asm-offsets.*
 %exclude %{_kernelsrcdir}/arch/*/kernel/sigframe.h
+%if %{with abi}
+%{_kernelsrcdir}/abi
+%endif /* abi */
 %{_kernelsrcdir}/block
 %{_kernelsrcdir}/crypto
 %{_kernelsrcdir}/drivers
@@ -1841,6 +1865,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1558.2.144  2008-02-26 09:47:23  marcus
+- addedd Linux-ABI support. Bcond, default disabled.
+
 Revision 1.441.2.1558.2.143  2008-02-18 15:37:08  glen
 - fix for "-" vs "_" in grsec kernel; rel 9
 
================================================================

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