X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=scripts%2Fkernel-2.6-planetlab.spec;h=4689c23ea5e4e8f4d00de3ce8f787ec0c3ac7b12;hb=c5c6b216cd905dfdab60444d44628387377b6f30;hp=90734db3f7fd549277a07164b11b3f84b9ac32b3;hpb=3d1e8546acc43f5d8d0f0e1218b4f063bacd9881;p=linux-2.6.git

diff --git a/scripts/kernel-2.6-planetlab.spec b/scripts/kernel-2.6-planetlab.spec
index 90734db3f..4689c23ea 100644
--- a/scripts/kernel-2.6-planetlab.spec
+++ b/scripts/kernel-2.6-planetlab.spec
@@ -5,9 +5,9 @@ Summary: The Linux kernel (the core of the Linux operating system)
 
 %define buildup 1
 %define buildsmp 1
-%define builduml 1
+%define builduml 0
 %define buildxen 0
-%define builddoc 1
+%define builddoc 0
 
 # Versions of various parts
 
@@ -17,13 +17,12 @@ 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.2142_FC4.1%{?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
-%define kernel_arch i386
 
 %define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE}
 
@@ -99,7 +98,6 @@ BuildPreReq: module-init-tools, patch >= 2.5.4, bash >= 2.03, sh-utils, tar
 BuildPreReq: bzip2, findutils, gzip, m4, perl, make >= 3.78, gnupg, diffutils
 BuildRequires: gcc >= 3.3.3, binutils >= 2.12, redhat-rpm-config
 BuildConflicts: rhbuildsys(DiskFree) < 500Mb
-BuildArchitectures: i686
 
 
 Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2
@@ -297,8 +295,8 @@ BuildKernel() {
     # other RPMs that bootstrap off of the kernel build)
     cd $RPM_BUILD_DIR
     rm -rf linux-%{kversion}$Flavour
-    cp -rl kernel-%{kversion}/vanilla linux-%{kversion}$Flavour
-    cd linux-%{kversion}$Flavour
+    cp -rl kernel-%{kversion}/vanilla linux-%{_target_cpu}-%{kversion}$Flavour
+    cd linux-%{_target_cpu}-%{kversion}$Flavour
 
     # Pick the right config file for the kernel we're building
     if [ -n "$Flavour" ] ; then
@@ -376,7 +374,6 @@ BuildKernel() {
     rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
     cp arch/%{_arch}/kernel/asm-offsets.s $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch}/kernel || :
     cp .config $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
-    cp .kernelrelease $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
     cp -a scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
     if [ -d arch/%{_arch}/scripts ]; then
       cp -a arch/%{_arch}/scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch} || :
@@ -394,8 +391,9 @@ BuildKernel() {
       cp -a asm-i386 $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
     fi
 %if %{buildxen}
-    if [ "$Flavour" = "xen" ]; then
-      cp -a asm-xen $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
+    if [ "$Flavour" = "xenU" ]; then
+      cp -a xen $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
+      cp -a asm-i386 $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
     fi
 %endif
 %if %{builduml}
@@ -426,6 +424,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
 
@@ -450,20 +453,26 @@ BuildKernel() {
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/boot
 
+%if "%{_target_cpu}" == "x86_64"
+%define kernel_arch %{_target_cpu}
+%else
+%define kernel_arch i386
+%endif
+
 %if %{buildup}
 BuildKernel %make_target %kernel_arch
 %endif
 
-%if %{buildsmp}
+%if %{buildsmp} && "%{_target_cpu}" != "i586"
 BuildKernel %make_target %kernel_arch smp
 %endif
 
-%if %{builduml}
+%if %{builduml} && "%{_target_cpu}" != "i586"
 BuildKernel linux um uml
 %endif
 
-%if %{buildxen}
-BuildKernel %make_target xen xenU
+%if %{buildxen} && "%{_target_cpu}" != "i586"
+BuildKernel vmlinuz %kernel_arch xenU
 %endif
 
 ###
@@ -474,7 +483,7 @@ BuildKernel %make_target xen xenU
 
 cd vanilla
 
-%if %{buildxen}
+%if %{buildxen} && "%{_target_cpu}" == "i686"
 mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
 rm -f $RPM_BUILD_ROOT/etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf
 cat > $RPM_BUILD_ROOT/etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf <<\EOF
@@ -659,7 +668,7 @@ rm -f /lib/modules/%{KVERREL}uml/modules.*
 %verify(not mtime) /usr/src/kernels/%{KVERREL}-%{_target_cpu}
 %endif
 
-%if %{buildsmp}
+%if %{buildsmp} && "%{_target_cpu}" == "i686"
 %files smp
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}smp
@@ -678,7 +687,7 @@ rm -f /lib/modules/%{KVERREL}uml/modules.*
 /usr/src/kernels/%{KVERREL}smp-%{_target_cpu}
 %endif
 
-%if %{builduml}
+%if %{builduml} && "%{_target_cpu}" == "i686"
 %files uml
 %defattr(-,root,root)
 %{_bindir}/linux
@@ -700,7 +709,7 @@ rm -f /lib/modules/%{KVERREL}uml/modules.*
 /lib/modules/%{KVERREL}uml/updates
 %endif
 
-%if %{buildxen}
+%if %{buildxen} && "%{_target_cpu}" == "i686"
 %files xenU
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}xenU