SPECS (LINUX_2_6): kernel.spec - merged KABI, module-build symlink...

[zbyniu]

Author: zbyniu                       Date: Wed Apr  9 01:04:33 2008 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- merged KABI, module-build symlinks from LINUX_2_6_22

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1860 -> 1.441.2.1861) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1860 SPECS/kernel.spec:1.441.2.1861
--- SPECS/kernel.spec:1.441.2.1860	Wed Apr  9 01:44:18 2008
+++ SPECS/kernel.spec	Wed Apr  9 03:04:27 2008
@@ -114,7 +114,6 @@
 %define		_pre_rc			%{nil}
 %define		_rc			%{nil}
 %define		_rel			0.2
-%define		subname			%{?with_pax:-pax}%{?with_grsec_full:-grsecurity}%{?with_xen0:-xen0}%{?with_xenU:-xenU}%{?with_rescuecd:-rescuecd}
 
 %define		_enable_debug_packages			0
 
@@ -123,12 +122,27 @@
 %define		netfilter_snap		20070806
 %define		xen_version		3.0.2
 
+%define		__alt_kernel	%{?with_pax:pax}%{?with_grsec_full:grsecurity}%{?with_xen0:xen0}%{?with_xenU:xenU}%{?with_rescuecd:-rescuecd}
+%if "%{__alt_kernel}" != ""
+%define		alt_kernel	%{__alt_kernel}
+%endif
+
+# kernel release (used in filesystem and eventually in uname -r)
+# modules will be looked from /lib/modules/%{kernel_release}
+# _localversion is just that without version for "> localversion"
+%define		_localversion %{KABI}
+%define		kernel_release %{version}%{?alt_kernel:_%{alt_kernel}}-%{_localversion}
+
+# Our Kernel ABI, increase this when you want the out of source modules being rebuilt
+# Usually same as %{_rel}
+%define		KABI		0
+
 Summary:	The Linux kernel (the core of the Linux operating system)
 Summary(de.UTF-8):	Der Linux-Kernel (Kern des Linux-Betriebssystems)
 Summary(et.UTF-8):	Linuxi kernel (ehk operatsioonisüsteemi tuum)
 Summary(fr.UTF-8):	Le Kernel-Linux (La partie centrale du systeme)
 Summary(pl.UTF-8):	Jądro Linuksa
-Name:		kernel%{subname}
+Name:		kernel%{_alt_kernel}
 
 %if "%{_prepatch}" == "%{nil}"
 Version:	%{_basever}%{_postver}
@@ -411,7 +425,7 @@
 Conflicts:	reiser4progs < 1.0.0
 %endif
 Conflicts:	reiserfsprogs < 3.6.3
-Conflicts:	udev < 071
+Conflicts:	udev < 1:071
 Conflicts:	util-linux < 2.10o
 Conflicts:	xfsprogs < 2.6.0
 %if %{with xen0} || %{with xenU}
@@ -444,12 +458,7 @@
 %define		initrd_dir	/boot
 %endif
 
-# kernel release (used in filesystem and eventually in uname -r)
-# modules will be looked from /lib/modules/%{kernel_release}
-# _localversion is just that without version for "> localversion"
-%define		_localversion %{release}
-%define		kernel_release %{version}%{subname}-%{_localversion}
-%define		_kernelsrcdir	/usr/src/linux%{subname}-%{version}
+%define		_kernelsrcdir	/usr/src/linux%{_alt_kernel}-%{version}
 
 %if "%{_target_base_arch}" != "%{_arch}"
 	%define	CrossOpts ARCH=%{_target_base_arch} CROSS_COMPILE=%{_target_cpu}-pld-linux-
@@ -981,7 +990,7 @@
 %endif
 
 # Fix EXTRAVERSION in main Makefile
-sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{_postver}%{subname}#g' Makefile
+sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{_postver}%{?alt_kernel:_%{alt_kernel}}#g' Makefile
 
 # on sparc this line causes CONFIG_INPUT=m (instead of =y), thus breaking build
 sed -i -e '/select INPUT/d' net/bluetooth/hidp/Kconfig
@@ -1428,7 +1437,7 @@
 		title='PLD Linux'
 	fi
 
-	ext='%{?with_pax:pax}%{?with_grsec_full:grsecurity}%{?with_xen0:Xen0}%{?with_xenU:XenU}'
+	ext='%{__alt_kernel}'
 	if [ "$ext" ]; then
 		title="$title $ext"
 	fi
@@ -1470,17 +1479,26 @@
 %depmod %{kernel_release}
 
 %post headers
-ln -snf %{basename:%{_kernelsrcdir}} %{_prefix}/src/linux%{subname}
+ln -snf %{basename:%{_kernelsrcdir}} %{_prefix}/src/linux%{_alt_kernel}
 
 %postun headers
 if [ "$1" = "0" ]; then
-	if [ -L %{_prefix}/src/linux%{subname} ]; then
-		if [ "$(readlink %{_prefix}/src/linux%{subname})" = "linux%{subname}-%{version}" ]; then
-			rm -f %{_prefix}/src/linux%{subname}
+	if [ -L %{_prefix}/src/linux%{_alt_kernel} ]; then
+		if [ "$(readlink %{_prefix}/src/linux%{_alt_kernel})" = "linux%{_alt_kernel}-%{version}" ]; then
+			rm -f %{_prefix}/src/linux%{_alt_kernel}
 		fi
 	fi
 fi
 
+%triggerin module-build -- %{name} = %{epoch}:%{version}-%{release}
+ln -sfn %{_kernelsrcdir} /lib/modules/%{kernel_release}/build
+ln -sfn %{_kernelsrcdir} /lib/modules/%{kernel_release}/source
+
+%triggerun module-build -- %{name} = %{epoch}:%{version}-%{release}
+if [ "$1" = 0 ]; then
+	rm -f /lib/modules/%{kernel_release}/{build,source}
+fi
+
 %files
 %defattr(644,root,root,755)
 %ifarch sparc sparc64
@@ -1530,6 +1548,9 @@
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/usb/host/sl811_cs.ko*
 %endif
 %ghost /lib/modules/%{kernel_release}/modules.*
+# symlinks pointing to kernelsrcdir
+%ghost /lib/modules/%{kernel_release}/build
+%ghost /lib/modules/%{kernel_release}/source
 %dir %{_sysconfdir}/modprobe.d/%{kernel_release}
 
 %ifarch alpha %{ix86} %{x8664} ppc ppc64 sparc sparc64
@@ -1670,6 +1691,7 @@
 %{_kernelsrcdir}/MAINTAINERS
 %{_kernelsrcdir}/README
 %{_kernelsrcdir}/REPORTING-BUGS
+%{_kernelsrcdir}/.mailmap
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -1678,6 +1700,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1861  2008-04-09 01:04:27  zbyniu
+- merged KABI, module-build symlinks from LINUX_2_6_22
+
 Revision 1.441.2.1860  2008-04-08 23:44:18  zbyniu
 - macro %{Features}, de.UTF-8 summaries and descs (from kernel-desktop.spec)
 
================================================================

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