Contents of /trunk/kernel26-xen/patches-2.6.25-r1/1010-2.6.25-xen-Add-a-vmlinuz-target.patch
Parent Directory
| 
Revision Log
Revision 606 -
(show annotations)
(download)
Thu May 22 23:13:13 2008 UTC (15 years, 11 months ago) by niro
File size: 2432 byte(s)
Thu May 22 23:13:13 2008 UTC (15 years, 11 months ago) by niro
File size: 2432 byte(s)
-ver bump to 2.6.25-magellan-r1: - linux-2.6.25.4 - fbcondecor-0.9.4 - squashfs-3.3 - unionfs-2.3.3 - tuxonice-3.0-rc7 - linux-phc-0.3.0 - acpi-dstd-0.9a - reiser4 - xen-3.2.0 . ipw3945-1.2.2
| 1 | From f04b0fa143f681470cf515151491dc6359ec2bc9 Mon Sep 17 00:00:00 2001 |
| 2 | From: Mark McLoughlin <markmc@redhat.com> |
| 3 | Date: Tue, 19 Feb 2008 15:34:32 +0000 |
| 4 | Subject: [PATCH] xen: Add a vmlinuz target |
| 5 | |
| 6 | Although patches are in progress to allow Xen boot |
| 7 | a DomU using a bzImage, support for booting a Dom0 |
| 8 | using a bzImage is still a ways off. |
| 9 | |
| 10 | For now, just add a target to build a gzip-ed ELF |
| 11 | file which Xen can use to boot both Dom0 and DomU. |
| 12 | |
| 13 | Signed-off-by: Mark McLoughlin <markmc@redhat.com> |
| 14 | --- |
| 15 | arch/x86/Makefile | 9 +++++++++ |
| 16 | arch/x86/boot/.gitignore | 1 + |
| 17 | arch/x86/boot/Makefile | 9 +++++++++ |
| 18 | 3 files changed, 19 insertions(+), 0 deletions(-) |
| 19 | |
| 20 | diff --git a/arch/x86/Makefile b/arch/x86/Makefile |
| 21 | index f1e739a..14a752e 100644 |
| 22 | --- a/arch/x86/Makefile |
| 23 | +++ b/arch/x86/Makefile |
| 24 | @@ -206,6 +206,15 @@ boot := arch/x86/boot |
| 25 | PHONY += zImage bzImage compressed zlilo bzlilo \ |
| 26 | zdisk bzdisk fdimage fdimage144 fdimage288 isoimage install |
| 27 | |
| 28 | +ifdef CONFIG_XEN |
| 29 | +PHONY += vmlinuz |
| 30 | +all: vmlinuz |
| 31 | + |
| 32 | +vmlinuz: KBUILD_IMAGE := $(boot)/vmlinuz |
| 33 | +vmlinuz: vmlinux |
| 34 | + $(Q)$(MAKE) $(build)=$(boot) $(KBUILD_IMAGE) |
| 35 | +endif |
| 36 | + |
| 37 | # Default kernel to build |
| 38 | all: bzImage |
| 39 | |
| 40 | diff --git a/arch/x86/boot/.gitignore b/arch/x86/boot/.gitignore |
| 41 | index b1bdc4c..35e7956 100644 |
| 42 | --- a/arch/x86/boot/.gitignore |
| 43 | +++ b/arch/x86/boot/.gitignore |
| 44 | @@ -5,3 +5,4 @@ setup.bin |
| 45 | setup.elf |
| 46 | cpustr.h |
| 47 | mkcpustr |
| 48 | +vmlinuz |
| 49 | diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile |
| 50 | index f88458e..61bba92 100644 |
| 51 | --- a/arch/x86/boot/Makefile |
| 52 | +++ b/arch/x86/boot/Makefile |
| 53 | @@ -26,6 +26,7 @@ SVGA_MODE := -DSVGA_MODE=NORMAL_VGA |
| 54 | #RAMDISK := -DRAMDISK=512 |
| 55 | |
| 56 | targets := vmlinux.bin setup.bin setup.elf zImage bzImage |
| 57 | +targets += vmlinuz vmlinux-stripped |
| 58 | subdir- := compressed |
| 59 | |
| 60 | setup-y += a20.o cmdline.o copy.o cpu.o cpucheck.o edd.o |
| 61 | @@ -105,6 +106,14 @@ $(obj)/setup.bin: $(obj)/setup.elf FORCE |
| 62 | $(obj)/compressed/vmlinux: FORCE |
| 63 | $(Q)$(MAKE) $(build)=$(obj)/compressed IMAGE_OFFSET=$(IMAGE_OFFSET) $@ |
| 64 | |
| 65 | +$(obj)/vmlinuz: $(obj)/vmlinux-stripped FORCE |
| 66 | + $(call if_changed,gzip) |
| 67 | + @echo 'Kernel: $@ is ready' ' (#'`cat .version`')' |
| 68 | + |
| 69 | +$(obj)/vmlinux-stripped: OBJCOPYFLAGS := -g --strip-unneeded |
| 70 | +$(obj)/vmlinux-stripped: vmlinux FORCE |
| 71 | + $(call if_changed,objcopy) |
| 72 | + |
| 73 | # Set this if you want to pass append arguments to the zdisk/fdimage/isoimage kernel |
| 74 | FDARGS = |
| 75 | # Set this if you want an initrd included with the zdisk/fdimage/isoimage kernel |
| 76 | -- |
| 77 | 1.5.4.1 |
| 78 |