[kernel] r6910 - in dists/trunk/linux-2.6/debian: . patches/series

[Sven Luther]

Author: luther
Date: Tue Jun 27 12:22:09 2006
New Revision: 6910

Added:
   dists/trunk/linux-2.6/debian/patches/powerpc-mkvmlinuz-support-powerpc.patch
      - copied, changed from r6909, /dists/trunk/linux-2.6/debian/patches/powerpc-mkvmlinuz-support-2.patch
   dists/trunk/linux-2.6/debian/patches/powerpc-mkvmlinuz-support-ppc.patch
      - copied unchanged from r6909, /dists/trunk/linux-2.6/debian/patches/powerpc-mkvmlinuz-support.patch
Removed:
   dists/trunk/linux-2.6/debian/patches/powerpc-mkvmlinuz-support-2.patch
   dists/trunk/linux-2.6/debian/patches/powerpc-mkvmlinuz-support.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/2

Log:
[powerpc] Fixed mkvmlinuz support, closes #375645


Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Tue Jun 27 12:22:09 2006
@@ -9,13 +9,14 @@
   [ Sven Luther ]
   * [powerpc] Added console=hvc0 default commandline option to powerpc64 flavour.
   * [powerpc] Now THERM_PM72 and all WINDFARMs are builtin, for better fan control.
+  * [powerpc] Fixed mkvmlinuz support, which was missing from -1. (Closes: #375645)
 
   [ Martin Michlmayr ]
   * [mipsel] Fix compilation error in dz serial driver.
   * [mipsel] Update configs.
   * [mipsel] Add a build fix for the Cobalt early console support.
 
- -- Jurij Smakov <jurij at debian.org>  Sat, 24 Jun 2006 10:54:59 -0700
+ -- Sven Luther <luther at debian.org>  Tue, 27 Jun 2006 13:52:03 +0200
 
 linux-2.6 (2.6.17-1) unstable; urgency=low
 

Copied: dists/trunk/linux-2.6/debian/patches/powerpc-mkvmlinuz-support-powerpc.patch (from r6909, /dists/trunk/linux-2.6/debian/patches/powerpc-mkvmlinuz-support-2.patch)
==============================================================================
--- /dists/trunk/linux-2.6/debian/patches/powerpc-mkvmlinuz-support-2.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/powerpc-mkvmlinuz-support-powerpc.patch	Tue Jun 27 12:22:09 2006
@@ -18,16 +18,16 @@
 # Upstream status: This patch stays a debian specific patch for now,
 # but it is not in a form where it could go upstream.
 #
---- linux-2.6.16/arch/powerpc/Makefile.orig	2006-04-12 16:57:16.000000000 +0000
-+++ linux-2.6.16/arch/powerpc/Makefile	2006-04-12 16:58:53.000000000 +0000
-@@ -148,7 +148,7 @@
+--- linux-2.6.17/arch/powerpc/Makefile.orig	2006-04-12 16:57:16.000000000 +0000
++++ linux-2.6.17/arch/powerpc/Makefile	2006-04-12 16:58:53.000000000 +0000
+@@ -147,7 +147,7 @@
  
  CPPFLAGS_vmlinux.lds	:= -Upowerpc
  
--BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd vmlinux.sm uImage
-+BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd vmlinux.sm uImage mkvmlinuz_support_install
+-BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd vmlinux.sm uImage vmlinux.bin
++BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd vmlinux.sm uImage vmlinux.bin mkvmlinuz_support_install
  
- .PHONY: $(BOOT_TARGETS)
+ PHONY += $(BOOT_TARGETS)
  
 --- linux-2.6.16/arch/powerpc/boot/Makefile.orig	2006-04-12 16:40:11.000000000 +0000
 +++ linux-2.6.16/arch/powerpc/boot/Makefile	2006-04-12 19:23:06.000000000 +0000

Modified: dists/trunk/linux-2.6/debian/patches/series/2
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/2	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/2	Tue Jun 27 12:22:09 2006
@@ -1,2 +1,4 @@
 + serial-dz.patch
 + mips-cobalt-console.patch
++ powerpc-mkvmlinuz-support-ppc.patch
++ powerpc-mkvmlinuz-support-powerpc.patch