From d23389cff497dcf09f4134fa77124bf6ba4fd5e5 Mon Sep 17 00:00:00 2001 From: Marc Fiuczynski Date: Tue, 4 Oct 2005 19:24:05 +0000 Subject: [PATCH] take out xen_conflicts for now --- scripts/kernel-2.6-planetlab.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/kernel-2.6-planetlab.spec b/scripts/kernel-2.6-planetlab.spec index 0a2d12c24..e785beec7 100644 --- a/scripts/kernel-2.6-planetlab.spec +++ b/scripts/kernel-2.6-planetlab.spec @@ -62,7 +62,9 @@ Summary: The Linux kernel (the core of the Linux operating system) # # The ld.so.conf.d file we install uses syntax older ldconfig's don't grok. # -%define xen_conflicts glibc < 2.3.5-1 + +# MEF commented out +# %define xen_conflicts glibc < 2.3.5-1 # # Packages that need to be installed before the kernel is, because the %post @@ -189,7 +191,10 @@ Prereq: %{kernel_prereq} Conflicts: %{kernel_dot_org_conflicts} Conflicts: %{package_conflicts} Conflicts: %{nptl_conflicts} -Conflicts: %{xen_conflicts} + +# MEF commented out +# Conflicts: %{xen_conflicts} + # We can't let RPM do the dependencies automatic because it'll then pick up # a correct but undesirable perl dependency from the module headers which # isn't required for the kernel proper to function -- 2.43.0