diff --git a/debian/changelog b/debian/changelog index 8f30737af..3691b0dcf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -37,6 +37,7 @@ linux-2.6 (2.6.26~rc3-1~experimental.1) UNRELEASED; urgency=low [ Ian Campbell ] * Readme.build updated on how to generate orig tarballs. + * Forward port vmlinuz-target.patch. -- maximilian attems Sat, 26 Apr 2008 23:11:17 +0200 diff --git a/debian/patches/features/all/xen/vmlinuz-target.patch b/debian/patches/features/all/xen/vmlinuz-target.patch index 4df3f412e..30a48d47c 100644 --- a/debian/patches/features/all/xen/vmlinuz-target.patch +++ b/debian/patches/features/all/xen/vmlinuz-target.patch @@ -41,10 +41,10 @@ diff --git a/arch/x86/boot/.gitignore b/arch/x86/boot/.gitignore index b1bdc4c..35e7956 100644 --- a/arch/x86/boot/.gitignore +++ b/arch/x86/boot/.gitignore -@@ -5,3 +5,4 @@ setup.bin +@@ -6,3 +6,4 @@ setup.bin + setup + setup.bin setup.elf - cpustr.h - mkcpustr +vmlinuz diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile index f88458e..61bba92 100644 diff --git a/debian/patches/series/1~experimental.1-extra b/debian/patches/series/1~experimental.1-extra index 4bf2b330a..afe86d937 100644 --- a/debian/patches/series/1~experimental.1-extra +++ b/debian/patches/series/1~experimental.1-extra @@ -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/xenctrl.patch featureset=xen #+ features/all/xen/xenctrl-capabilities.patch featureset=xen #+ features/all/xen/xenctrl-privcmd.patch featureset=xen