SPECS (LINUX_2_6): kernel.spec - drop kabi idea like in LINUX_2_6_25 branch.

pluto pluto at pld-linux.org
Mon Sep 8 10:52:30 CEST 2008


Author: pluto                        Date: Mon Sep  8 08:52:30 2008 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- drop kabi idea like in LINUX_2_6_25 branch.

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1939 -> 1.441.2.1940) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1939 SPECS/kernel.spec:1.441.2.1940
--- SPECS/kernel.spec:1.441.2.1939	Sat Sep  6 12:42:27 2008
+++ SPECS/kernel.spec	Mon Sep  8 10:52:21 2008
@@ -123,11 +123,9 @@
 
 # kernel release (used in filesystem and eventually in uname -r)
 # modules will be looked from /lib/modules/%{kernel_release}
-%define		kernel_release %{version}%{?_alt_kernel:%{_alt_kernel}}_%{KABI}
-
-# Our Kernel ABI, increase this when you want the out of source modules being rebuilt
-# Usually same as %{_rel}. Never decrement this (policy).
-%define		KABI		2
+# _localversion is just that without version for "> localversion"
+%define		_localversion %{_rel}
+%define		kernel_release %{version}%{?_alt_kernel:%{_alt_kernel}}-%{_localversion}
 
 Summary:	The Linux kernel (the core of the Linux operating system)
 Summary(de.UTF-8):	Der Linux-Kernel (Kern des Linux-Betriebssystems)
@@ -1281,7 +1279,7 @@
 }
 
 KERNEL_BUILD_DIR=`pwd`
-echo "_%{KABI}" > localversion
+echo "-%{_localversion}" > localversion
 
 KERNEL_INSTALL_DIR="$KERNEL_BUILD_DIR/build-done/kernel"
 rm -rf $KERNEL_INSTALL_DIR
@@ -1702,6 +1700,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1940  2008/09/08 08:52:21  pluto
+- drop kabi idea like in LINUX_2_6_25 branch.
+
 Revision 1.441.2.1939  2008/09/06 10:42:27  pluto
 - move kernel/bounds.c to module-build subpackage.
   build scripts use it:
@@ -1745,7 +1746,7 @@
 - disable tproxy path when w/o vserver (it fails to apply)
 
 Revision 1.441.2.1927  2008/06/25 11:02:10  arekm
-up to 2.6.25.9; backport security= option
+- up to 2.6.25.9; backport security= option
 
 Revision 1.441.2.1926  2008/06/23 20:11:16  arekm
 - rel 2; fix pcmcia split (no duplication of files; move b1pcmcia to pcmcia subpkg)
@@ -1754,7 +1755,7 @@
 - uboot-mkimage neede on ppc build (arch/powerpc/boot/wrapper uses it)
 
 Revision 1.441.2.1924  2008/06/23 09:29:59  arekm
-KABI 1 since this is new kernel in th
+- KABI 1 since this is new kernel in th
 
 Revision 1.441.2.1923  2008/06/23 08:56:39  arekm
 - fix ppc build
================================================================

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



More information about the pld-cvs-commit mailing list