[kernel] r11461 - in dists/trunk/linux-2.6/debian: . patches/features/all/xen patches/series

[Maximilian Attems]

Author: maks
Date: Mon May 26 14:03:29 2008
New Revision: 11461

Log:
Forward port vmlinuz-target.patch

thanks Ian Campbell.


Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/features/all/xen/vmlinuz-target.patch
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Mon May 26 14:03:29 2008
@@ -37,6 +37,7 @@
 
   [ Ian Campbell ]
   * Readme.build updated on how to generate orig tarballs.
+  * Forward port vmlinuz-target.patch.
 
  -- maximilian attems <maks at debian.org>  Sat, 26 Apr 2008 23:11:17 +0200
 

Modified: dists/trunk/linux-2.6/debian/patches/features/all/xen/vmlinuz-target.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/all/xen/vmlinuz-target.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/features/all/xen/vmlinuz-target.patch	Mon May 26 14:03:29 2008
@@ -41,10 +41,10 @@
 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

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra	Mon May 26 14:03:29 2008
@@ -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