From acc9895b87be4c2aa4b97d610a4a01f012b87c3b Mon Sep 17 00:00:00 2001 From: Marc Fiuczynski Date: Mon, 23 Jul 2007 15:23:10 +0000 Subject: [PATCH 1/1] Adjust to build properly for i586, i686, and x86_64. --- scripts/kernel-2.6-planetlab.spec | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/scripts/kernel-2.6-planetlab.spec b/scripts/kernel-2.6-planetlab.spec index 70aa3df40..944187df2 100644 --- a/scripts/kernel-2.6-planetlab.spec +++ b/scripts/kernel-2.6-planetlab.spec @@ -455,7 +455,11 @@ mkdir -p $RPM_BUILD_ROOT/boot %if "%{_target_cpu}" == "x86_64" %define kernel_arch %{_target_cpu} -%else +%endif +%if "%{_target_cpu}" == "i586" +%define kernel_arch i386 +%endif +%if "%{_target_cpu}" == "i686" %define kernel_arch i386 %endif @@ -463,16 +467,14 @@ mkdir -p $RPM_BUILD_ROOT/boot BuildKernel %make_target %kernel_arch %endif -%if %{buildsmp} && "%{_target_cpu}" != "i586" +%if %{buildsmp} && "%{_target_cpu}" == "i686" BuildKernel %make_target %kernel_arch smp -%endif - -%if %{builduml} && "%{_target_cpu}" != "i586" BuildKernel linux um uml +BuildKernel vmlinuz %kernel_arch xenU %endif -%if %{buildxen} && "%{_target_cpu}" != "i586" -BuildKernel vmlinuz %kernel_arch xenU +%if %{buildsmp} && "%{_target_cpu}" == "x86_64" +BuildKernel %make_target %kernel_arch smp %endif ### -- 2.43.0