From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Tue, 31 Oct 2006 15:54:51 +0000 (+0000)
Subject: fixed to build xen rpm properly
X-Git-Tag: before-fedora-2_6_18-1_2239_FC5-vs2_0_2_2-rc6-merge~9
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=7206ec897bfeaa707bd9f7b7d119017ece868a41;p=linux-2.6.git

fixed to build xen rpm properly
---

diff --git a/scripts/kernel-2.6-planetlab.spec b/scripts/kernel-2.6-planetlab.spec
index c5935528b..a9fe783fb 100644
--- a/scripts/kernel-2.6-planetlab.spec
+++ b/scripts/kernel-2.6-planetlab.spec
@@ -6,7 +6,7 @@ Summary: The Linux kernel (the core of the Linux operating system)
 %define buildup 1
 %define buildsmp 1
 %define builduml 1
-%define buildxen 0
+%define buildxen 1
 %define builddoc 1
 
 # Versions of various parts
@@ -394,7 +394,7 @@ BuildKernel() {
       cp -a asm-i386 $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
     fi
 %if %{buildxen}
-    if [ "$Flavour" = "xen" ]; then
+    if [ "$Flavour" = "xenU" ]; then
       cp -a asm-xen $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
     fi
 %endif
@@ -426,6 +426,11 @@ BuildKernel() {
     mkdir -p $RPM_BUILD_ROOT/usr/lib/debug/lib/modules/$KernelVer
     cp vmlinux $RPM_BUILD_ROOT/usr/lib/debug/lib/modules/$KernelVer
 %endif
+%if %{buildxen}
+    if [ -f vmlinuz ]; then
+      cp vmlinuz $RPM_BUILD_ROOT/%{image_install_path}/vmlinuz-$KernelVer
+    fi
+%endif
 
     find $RPM_BUILD_ROOT/lib/modules/$KernelVer -name "*.ko" -type f >modnames
 
@@ -463,7 +468,7 @@ BuildKernel linux um uml
 %endif
 
 %if %{buildxen}
-BuildKernel %make_target xen xenU
+BuildKernel vmlinuz %kernel_arch xenU
 %endif
 
 ###