[kernel] r7937 - dists/trunk/linux-2.6/debian/patches/debian

[Sven Luther]

Author: luther
Date: Tue Dec  5 17:10:22 2006
New Revision: 7937

Modified:
   dists/trunk/linux-2.6/debian/patches/debian/powerpc-mkvmlinuz-support-powerpc.patch
Log:
Fixed powerpc-mkvmlinuz-support-powerpc.patch for 2.6.19.


Modified: dists/trunk/linux-2.6/debian/patches/debian/powerpc-mkvmlinuz-support-powerpc.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/powerpc-mkvmlinuz-support-powerpc.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/debian/powerpc-mkvmlinuz-support-powerpc.patch	Tue Dec  5 17:10:22 2006
@@ -18,8 +18,8 @@
 # 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.19-rc6/arch/powerpc/Makefile.orig	2006-11-24 17:43:15.000000000 +0100
-+++ linux-2.6.19-rc6/arch/powerpc/Makefile	2006-11-24 17:44:32.000000000 +0100
+--- linux-2.6.19/arch/powerpc/Makefile.orig	2006-11-24 17:43:15.000000000 +0100
++++ linux-2.6.19/arch/powerpc/Makefile	2006-11-24 17:44:32.000000000 +0100
 @@ -148,7 +148,7 @@
  
  CPPFLAGS_vmlinux.lds	:= -Upowerpc
@@ -29,9 +29,9 @@
  
  PHONY += $(BOOT_TARGETS)
  
---- linux-2.6.19-rc6/arch/powerpc/boot/Makefile.orig	2006-11-24 17:42:40.000000000 +0100
-+++ linux-2.6.19-rc6/arch/powerpc/boot/Makefile	2006-11-24 17:45:45.000000000 +0100
-@@ -176,3 +176,23 @@
+--- linux-2.6.19/arch/powerpc/boot/Makefile.orig	2006-12-05 16:14:42.000000000 +0000
++++ linux-2.6.19/arch/powerpc/boot/Makefile	2006-12-05 16:13:37.000000000 +0000
+@@ -176,3 +176,18 @@
  
  clean-files += $(addprefix $(objtree)/, $(obj-boot) vmlinux.strip.gz)
  clean-files += $(addprefix $(objtree)/, $(obj-boot) vmlinux.bin.gz)
@@ -42,16 +42,11 @@
 +quiet_cmd_mkvmlinuz = INSTALL mkvmlinuz support files
 +	cmd_mkvmlinuz = cp -f $? $(INSTALL_MKVMLINUZ)
 +
-+mkvmlinuz-obj-sec = $(foreach section, $(1), $(patsubst %,$(obj)/mkvmlinuz-kernel-%.o, $(section)))
-+mkvmlinuz-src-sec = $(foreach section, $(1), $(patsubst %,$(obj)/mkvmlinuz-kernel-%.c, $(section)))
++mkvmlinuz-files := $(extra-y) $(wrapper) $(addprefix $(obj)/,$(hostprogs-y))
 +
-+$(call mkvmlinuz-src-sec, $(required) $(initrd)): $(obj)/mkvmlinuz-kernel-%.c:
-+	@touch $@
-+$(call mkvmlinuz-obj-sec, $(required) $(initrd)): $(obj)/mkvmlinuz-kernel-%.o: $(obj)/mkvmlinuz-kernel-%.c
-+	$(call if_changed_dep,bootcc)
-+
-+$(obj)/mkvmlinuz_support_install: $(obj)/addRamDisk $(obj)/addnote $(obj-boot) $(call mkvmlinuz-obj-sec, $(required) $(initrd)) $(srctree)/$(src)/zImage.lds
++$(obj)/mkvmlinuz_support_install: $(mkvmlinuz-files)
 +	mkdir -p $(INSTALL_MKVMLINUZ)
 +	$(call cmd,mkvmlinuz)
-+targets		+= mkvmlinuz_support_install
++
++targets	+= mkvmlinuz_support_install
 +