Adjust to build properly for i586, i686, and x86_64.

[linux-2.6.git] / scripts / kernel-2.6-planetlab.spec

diff --git a/scripts/kernel-2.6-planetlab.spec b/scripts/kernel-2.6-planetlab.spec
index 5a57955..944187d 100644 (file)
--- a/scripts/kernel-2.6-planetlab.spec
+++ b/scripts/kernel-2.6-planetlab.spec
@@ -17,10 +17,10 @@ Summary: The Linux kernel (the core of the Linux operating system)
 # that the kernel isn't the stock distribution kernel, for example by
 # adding some text to the end of the version number.
 #
-%define sublevel 17
+%define sublevel 20
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define release 1.2187_FC5.0%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define release 1.2949.fc6.vs2.2.0.1.0%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 %define signmodules 0
 %define make_target bzImage
 
@@ -294,7 +294,7 @@ BuildKernel() {
     # create a clean copy in BUILD/ (for backward compatibility with
     # other RPMs that bootstrap off of the kernel build)
     cd $RPM_BUILD_DIR
-    rm -rf linux-%{kversion}$Flavour
+    rm -rf linux-%{_target_cpu}-%{kversion}$Flavour
     cp -rl kernel-%{kversion}/vanilla linux-%{_target_cpu}-%{kversion}$Flavour
     cd linux-%{_target_cpu}-%{kversion}$Flavour
 
@@ -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
 
 ###