rpms/kernel/devel kernel.spec,1.2014,1.2015

[Dave Jones]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv27446

Modified Files:
	kernel.spec 
Log Message:
Remove crufty Xen remnants from specfile.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.2014
retrieving revision 1.2015
diff -u -p -r1.2014 -r1.2015
--- kernel.spec	8 Jun 2010 18:45:39 -0000	1.2014
+++ kernel.spec	8 Jun 2010 19:03:47 -0000	1.2015
@@ -250,7 +250,6 @@ Summary: The Linux kernel
 %endif
 %define with_smp 0
 %define with_pae 0
-%define with_xen 0
 %define with_kdump 0
 %define with_perftool 0
 %endif
@@ -433,19 +432,6 @@ Summary: The Linux kernel
 #
 %define package_conflicts initscripts < 7.23, udev < 063-6, iptables < 1.3.2-1, ipw2200-firmware < 2.4, iwl4965-firmware < 228.57.2, selinux-policy-targeted < 1.25.3-14, squashfs-tools < 4.0, wireless-tools < 29-3
 
-#
-# The ld.so.conf.d file we install uses syntax older ldconfig's don't grok.
-#
-%define kernel_xen_conflicts glibc < 2.3.5-1, xen < 3.0.1
-
-%define kernel_PAE_obsoletes kernel-smp < 2.6.17, kernel-xen <= 2.6.27-0.2.rc0.git6.fc10
-%define kernel_PAE_provides kernel-xen = %{rpmversion}-%{pkg_release}
-
-%ifarch x86_64
-%define kernel_obsoletes kernel-xen <= 2.6.27-0.2.rc0.git6.fc10
-%define kernel_provides kernel-xen = %{rpmversion}-%{pkg_release}
-%endif
-
 # We moved the drm include files into kernel-headers, make sure there's
 # a recent enough libdrm-devel on the system that doesn't have those.
 %define kernel_headers_conflicts libdrm-devel < 2.4.0-0.15
@@ -1529,15 +1515,6 @@ BuildKernel() {
     make -s ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer mod-fw=
 %ifarch %{vdso_arches}
     make -s ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT vdso_install KERNELRELEASE=$KernelVer
-    if grep '^CONFIG_XEN=y$' .config >/dev/null; then
-      echo > ldconfig-kernel.conf "\
-# This directive teaches ldconfig to search in nosegneg subdirectories
-# and cache the DSOs there with extra bit 0 set in their hwcap match
-# fields.  In Xen guest kernels, the vDSO tells the dynamic linker to
-# search in nosegneg subdirectories and to match this extra hwcap bit
-# in the ld.so.cache file.
-hwcap 0 nosegneg"
-    fi
     if [ ! -s ldconfig-kernel.conf ]; then
       echo > ldconfig-kernel.conf "\
 # Placeholder file, no vDSO hwcap entries used in this kernel."
@@ -1889,22 +1866,18 @@ fi}\
 %{nil}
 
 %kernel_variant_preun
-%ifarch x86_64
-%kernel_variant_post -r (kernel-smp|kernel-xen)
-%else
 %kernel_variant_post -r kernel-smp
-%endif
 
 %kernel_variant_preun smp
 %kernel_variant_post -v smp
 
 %kernel_variant_preun PAE
-%kernel_variant_post -v PAE -r (kernel|kernel-smp|kernel-xen)
+%kernel_variant_post -v PAE -r (kernel|kernel-smp)
 
 %kernel_variant_preun debug
 %kernel_variant_post -v debug
 
-%kernel_variant_post -v PAEdebug -r (kernel|kernel-smp|kernel-xen)
+%kernel_variant_post -v PAEdebug -r (kernel|kernel-smp)
 %kernel_variant_preun PAEdebug
 
 if [ -x /sbin/ldconfig ]
@@ -2034,6 +2007,9 @@ fi
 
 %changelog
 * Tue Jun 08 2010 Dave Jones <davej at redhat.com>
+- Remove crufty Xen remnants from specfile.
+
+* Tue Jun 08 2010 Dave Jones <davej at redhat.com>
 - Remove mkinitrd ifdefs. Dracut or GTFO.
 
 * Thu Jun 03 2010 Kyle McMartin <kyle at redhat.com>