From 2e0f70f3da0ae7cc9d35fde21380e88c5d5bbb4f Mon Sep 17 00:00:00 2001
From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Mon, 23 Jul 2007 17:40:52 +0000
Subject: [PATCH] another clean up attempt

---
 scripts/kernel-2.6-planetlab.spec | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/scripts/kernel-2.6-planetlab.spec b/scripts/kernel-2.6-planetlab.spec
index 944187df2..f0a32ab92 100644
--- a/scripts/kernel-2.6-planetlab.spec
+++ b/scripts/kernel-2.6-planetlab.spec
@@ -467,15 +467,25 @@ mkdir -p $RPM_BUILD_ROOT/boot
 BuildKernel %make_target %kernel_arch
 %endif
 
-%if %{buildsmp} && "%{_target_cpu}" == "i686"
+%if "%{_target_cpu}" == "i686"
+%if %{buildsmp} 
 BuildKernel %make_target %kernel_arch smp
+%endif
+
+%if %{builduml}
 BuildKernel linux um uml
+%endif
+
+%if %{buildxen}
 BuildKernel vmlinuz %kernel_arch xenU
 %endif
+%endif
 
-%if %{buildsmp} && "%{_target_cpu}" == "x86_64"
+%if "%{_target_cpu}" == "x86_64"
+%if %{buildsmp} 
 BuildKernel %make_target %kernel_arch smp
 %endif
+%endif
 
 ###
 ### install
-- 
2.43.0