The trunk build depends on
debian/patches/features/all/xen/vmlinuz-target.patch for the -xen
flavour packages (r10963). Unfortunately this patch was disabled because
it was thought to be applied upstream (r11210), actually it has not yet
been merged.
Attached patch makes it apply again and re-enables it.
Other disabled Xen patches from r11210:
* features/all/xen/blkfront-protocol.patch featureset=xen
* merged 3e334239d89d4a71610be5a3e8432464d421d9ec
* features/all/xen/xenctrl.patch featureset=xen
* features/all/xen/xenctrl-capabilities.patch featureset=xen
* features/all/xen/xenctrl-privcmd.patch featureset=xen
* features/all/xen/xenctrl-xenbus.patch featureset=xen
* features/all/xen/xenctrl-sys-hypervisor.patch featureset=xen
* all not merged but useless without dom0 support, not
currently worth having IMHO.
Ian.
--
Ian Campbell
In success there's a tendency to keep on doing what you were doing.
-- Alan Kay
Index: debian/patches/series/1~experimental.1-extra =================================================================== --- debian/patches/series/1~experimental.1-extra (revision 11459) +++ debian/patches/series/1~experimental.1-extra (working copy) @@ -1,7 +1,7 @@ + features/all/vserver/vs2.2.0-rc5.patch featureset=vserver featureset=xen-vserver + features/all/vserver/bindmount-dev.patch featureset=vserver featureset=xen-vserver -#+ features/all/xen/vmlinuz-target.patch featureset=xen ++ features/all/xen/vmlinuz-target.patch featureset=xen #+ features/all/xen/blkfront-protocol.patch featureset=xen #+ features/all/xen/xenctrl.patch featureset=xen #+ features/all/xen/xenctrl-capabilities.patch featureset=xen Index: debian/patches/features/all/xen/vmlinuz-target.patch =================================================================== --- debian/patches/features/all/xen/vmlinuz-target.patch (revision 11459) +++ debian/patches/features/all/xen/vmlinuz-target.patch (working copy) @@ -41,10 +41,14 @@ index b1bdc4c..35e7956 100644 --- a/arch/x86/boot/.gitignore +++ b/arch/x86/boot/.gitignore -@@ -5,3 +5,4 @@ setup.bin +@@ -5,7 +5,8 @@ setup.bin setup.elf cpustr.h mkcpustr + offsets.h + setup + setup.bin + setup.elf +vmlinuz diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile index f88458e..61bba92 100644
Attachment:
signature.asc
Description: This is a digitally signed message part