rpms/kernel-xen-2.6/devel linux-2.6-0060-xen-dom0-Add-a-vmlinuz-target.patch, NONE, 1.1.2.1 kernel.spec, 1.11.2.4, 1.11.2.5 xen-support-loading-bzImage.patch, 1.1.2.1, NONE
Mark McLoughlin (markmc)
fedora-extras-commits at redhat.com
Tue Feb 19 16:06:17 UTC 2008
Author: markmc
Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2864
Modified Files:
Tag: private-markmc-pv-ops-branch
kernel.spec
Added Files:
Tag: private-markmc-pv-ops-branch
linux-2.6-0060-xen-dom0-Add-a-vmlinuz-target.patch
Removed Files:
Tag: private-markmc-pv-ops-branch
xen-support-loading-bzImage.patch
Log Message:
Switch back to building a compressed ELF image rather than
bzImage since we don't yet have patches to support Dom0
bzImage boot (we only have DomU bzImage boot)
linux-2.6-0060-xen-dom0-Add-a-vmlinuz-target.patch:
--- NEW FILE linux-2.6-0060-xen-dom0-Add-a-vmlinuz-target.patch ---
>From fb3b534913680df3caeed83f54094d047c248785 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Tue, 19 Feb 2008 15:34:32 +0000
Subject: [PATCH] xen dom0: Add a vmlinuz target
Although patches are in progress to allow Xen boot
a DomU using a bzImage, support for booting a Dom0
using a bzImage is still a ways off.
For now, just add a target to build a gzip-ed ELF
file which Xen can use to boot Dom0.
Signed-off-by: Mark McLoughlin <markmc at redhat.com>
---
arch/x86/Makefile_32 | 9 +++++++++
arch/x86/boot/Makefile | 9 +++++++++
2 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/arch/x86/Makefile_32 b/arch/x86/Makefile_32
index 625090d..0865b07 100644
--- a/arch/x86/Makefile_32
+++ b/arch/x86/Makefile_32
@@ -130,6 +130,15 @@ boot := arch/x86/boot
PHONY += zImage bzImage compressed zlilo bzlilo \
zdisk bzdisk fdimage fdimage144 fdimage288 isoimage install
+ifdef CONFIG_XEN
+PHONY += vmlinuz
+all: vmlinuz
+
+vmlinuz: KBUILD_IMAGE := $(boot)/vmlinuz
+vmlinuz: vmlinux
+ $(Q)$(MAKE) $(build)=$(boot) $(KBUILD_IMAGE)
+endif
+
all: bzImage
# KBUILD_IMAGE specify target image being built
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
index 7a3116c..6f1b455 100644
--- a/arch/x86/boot/Makefile
+++ b/arch/x86/boot/Makefile
@@ -26,6 +26,7 @@ SVGA_MODE := -DSVGA_MODE=NORMAL_VGA
#RAMDISK := -DRAMDISK=512
targets := vmlinux.bin setup.bin setup.elf zImage bzImage
+targets += vmlinuz vmlinux-stripped
subdir- := compressed
setup-y += a20.o apm.o cmdline.o copy.o cpu.o cpucheck.o edd.o
@@ -97,6 +98,14 @@ $(obj)/setup.bin: $(obj)/setup.elf FORCE
$(obj)/compressed/vmlinux: FORCE
$(Q)$(MAKE) $(build)=$(obj)/compressed IMAGE_OFFSET=$(IMAGE_OFFSET) $@
+$(obj)/vmlinuz: $(obj)/vmlinux-stripped FORCE
+ $(call if_changed,gzip)
+ @echo 'Kernel: $@ is ready' ' (#'`cat .version`')'
+
+$(obj)/vmlinux-stripped: OBJCOPYFLAGS := -g --strip-unneeded
+$(obj)/vmlinux-stripped: vmlinux FORCE
+ $(call if_changed,objcopy)
+
# Set this if you want to pass append arguments to the zdisk/fdimage/isoimage kernel
FDARGS =
# Set this if you want an initrd included with the zdisk/fdimage/isoimage kernel
--
1.5.4.1
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel.spec,v
retrieving revision 1.11.2.4
retrieving revision 1.11.2.5
diff -u -r1.11.2.4 -r1.11.2.5
--- kernel.spec 19 Feb 2008 11:09:48 -0000 1.11.2.4
+++ kernel.spec 19 Feb 2008 16:05:29 -0000 1.11.2.5
@@ -140,8 +140,8 @@
%define xen_hv_version 3.2.0
%define xen_hv_dirname xen-%{xen_hv_version}
%define xen_flags verbose=y crash_debug=y
-%define xen_target bzImage
-%define xen_image arch/x86/boot/bzImage
+%define xen_target vmlinuz
+%define xen_image arch/x86/boot/vmlinuz
%define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE}
%define hdrarch %_target_cpu
@@ -749,6 +749,7 @@
Patch5057: linux-2.6-0057-xen-dom0-Add-basic-proc-xen-balloon.patch
Patch5058: linux-2.6-0058-xen-dom0-Re-work-privcmd_ioctl-a-little.patch
Patch5059: linux-2.6-0059-xen-dom0-Add-IOCTL_PRIVCMD_MMAP.patch
+Patch5060: linux-2.6-0060-xen-dom0-Add-a-vmlinuz-target.patch
# kernel-xen patches end
# Xen hypervisor patches (20000+)
@@ -762,9 +763,6 @@
# Include build-id notes on xen-syms
Patch20005: xen-syms-build-id.patch
-# Support booting bzImage 2.0.8 or higher
-Patch20006: xen-support-loading-bzImage.patch
-
%endif
BuildRoot: %{_tmppath}/%{mainpkgname}-%{KVERREL}-root-%{_target_cpu}
@@ -1390,6 +1388,7 @@
ApplyPatch linux-2.6-0057-xen-dom0-Add-basic-proc-xen-balloon.patch
ApplyPatch linux-2.6-0058-xen-dom0-Re-work-privcmd_ioctl-a-little.patch
ApplyPatch linux-2.6-0059-xen-dom0-Add-IOCTL_PRIVCMD_MMAP.patch
+ApplyPatch linux-2.6-0060-xen-dom0-Add-a-vmlinuz-target.patch
# kernel-xen apply end
# END OF PATCH APPLICATIONS
@@ -1443,7 +1442,6 @@
ApplyPatch xen-version-strings.patch
ApplyPatch xen-build-id.patch
ApplyPatch xen-syms-build-id.patch
-ApplyPatch xen-support-loading-bzImage.patch
%endif
--- xen-support-loading-bzImage.patch DELETED ---
More information about the fedora-extras-commits
mailing list