SPECS (LINUX_2_6_16): kernel.spec - pae is %{ix86} above (including) i686 o...

[glen]

Author: glen                         Date: Fri May 23 19:35:50 2008 GMT
Module: SPECS                         Tag: LINUX_2_6_16
---- Log message:
- pae is %{ix86} above (including) i686 only
- add -pae as alt kernel
- add xen bcond if any of the xen0/xenU is set

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1558.2.153 -> 1.441.2.1558.2.154) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1558.2.153 SPECS/kernel.spec:1.441.2.1558.2.154
--- SPECS/kernel.spec:1.441.2.1558.2.153	Wed May  7 16:11:24 2008
+++ SPECS/kernel.spec	Fri May 23 21:35:44 2008
@@ -88,7 +88,8 @@
 %endif
 
 %if %{with xen0} || %{with xenU}
-%define		pae	1
+%define		with_pae	1
+%define		with_xen	1
 %endif
 
 ## Programs required by kernel to work.
@@ -120,7 +121,7 @@
 
 %define		xen_version		3.0.2
 
-%define		__alt_kernel	%{?with_pax:pax}%{?with_grsec_full:grsecurity}%{?with_xen0:xen0}%{?with_xenU:xenU}
+%define		__alt_kernel	%{?with_pax:pax}%{?with_grsec_full:grsecurity}%{?with_xen0:xen0}%{?with_xenU:xenU}%{?with_pae:pae}
 %if "%{__alt_kernel}" != ""
 %define		alt_kernel	%{__alt_kernel}
 %endif
@@ -390,8 +391,8 @@
 Conflicts:	udev < %{_udev_ver}
 Conflicts:	util-linux < %{_util_linux_ver}
 Conflicts:	xfsprogs < %{_xfsprogs_ver}
-%if %{with xen0} || %{with xenU}
-ExclusiveArch:	%{ix86} %{x8664}
+%if %{with xen} || %{with pae}
+ExclusiveArch:	%{ix86} %{?with_xen:%{x8664}}
 ExcludeArch:	i386 i486 i586
 %else
 ExclusiveArch:	%{ix86} alpha %{x8664} ia64 ppc ppc64 sparc sparc64
@@ -948,7 +949,7 @@
 %patch103 -p1
 %patch104 -p1
 
-%if %{with xen0} || %{with xenU}
+%if %{with xen}
 %ifarch %{ix86} %{x8664} ia64
 %patch120 -p1
 %patch121 -p1
@@ -1103,7 +1104,7 @@
 	cat %{SOURCE51} >> arch/%{_target_base_arch}/defconfig
 %endif
 
-%if %{with xen0} || %{with xenU}
+%if %{with xen}
 	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
 
@@ -1193,7 +1194,7 @@
 %endif
 %else
 	%{__make} %CrossOpts \
-%if %{with xen0} || %{with xenU}
+%if %{with xen}
 		SHELL=/bin/bash \
 %endif
 		%{?with_verbose:V=1}
@@ -1213,7 +1214,7 @@
 	mkdir -p $KERNEL_INSTALL_DIR/boot
 	install System.map $KERNEL_INSTALL_DIR/boot/System.map-$KernelVer
 %ifarch %{ix86} %{x8664}
-%if %{with xen0} || %{with xenU}
+%if %{with xen}
 	install vmlinuz $KERNEL_INSTALL_DIR/boot/vmlinuz-$KernelVer
 %else
 	install arch/%{_target_base_arch}/boot/bzImage $KERNEL_INSTALL_DIR/boot/vmlinuz-$KernelVer
@@ -1580,7 +1581,7 @@
 %if %{have_drm}
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/char/drm
 %endif
-%if %{have_oss} && %{have_isa} && %{without xen0} && %{without xenU}
+%if %{have_oss} && %{have_isa} && %{without xen}
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/media/radio/miropcm20.ko*
 %endif
 %if %{with abi}
@@ -1674,7 +1675,7 @@
 %files sound-oss
 %defattr(644,root,root,755)
 /lib/modules/%{kernel_release}/kernel/sound/oss
-%if %{have_isa} && %{without xen0} && %{without xenU}
+%if %{have_isa} && %{without xen}
 /lib/modules/%{kernel_release}/kernel/drivers/media/radio/miropcm20.ko*
 %endif
 %endif
@@ -1698,7 +1699,7 @@
 %if %{have_drm}
 %exclude /lib/modules/%{kernel_release}smp/kernel/drivers/char/drm
 %endif
-%if %{have_oss} && %{have_isa} && %{without xen0} && %{without xenU}
+%if %{have_oss} && %{have_isa} && %{without xen}
 %exclude /lib/modules/%{kernel_release}smp/kernel/drivers/media/radio/miropcm20.ko*
 %endif
 %if %{with abi}
@@ -1792,7 +1793,7 @@
 %files smp-sound-oss
 %defattr(644,root,root,755)
 /lib/modules/%{kernel_release}smp/kernel/sound/oss
-%if %{have_isa} && %{without xen0} && %{without xenU}
+%if %{have_isa} && %{without xen}
 /lib/modules/%{kernel_release}smp/kernel/drivers/media/radio/miropcm20.ko*
 %endif
 %endif
@@ -1881,6 +1882,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1558.2.154  2008-05-23 19:35:44  glen
+- pae is %{ix86} above (including) i686 only
+- add -pae as alt kernel
+- add xen bcond if any of the xen0/xenU is set
+
 Revision 1.441.2.1558.2.153  2008-05-07 14:11:24  glen
 - use %{initrd_dir} macro, possibly fixing ia64 efi
 -  fix /boot symlinks for alt_kernel; rel 14
================================================================

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