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

[Sven Luther]

Author: luther
Date: Thu Sep  7 15:12:07 2006
New Revision: 7367

Modified:
   dists/trunk/linux-2.6/debian/patches/powerpc-mkvmlinuz-support-ppc.patch

Log:
Fixed patch, removed openfirmware support, since now only simple is built from ARCH=ppc.


Modified: dists/trunk/linux-2.6/debian/patches/powerpc-mkvmlinuz-support-ppc.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/powerpc-mkvmlinuz-support-ppc.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/powerpc-mkvmlinuz-support-ppc.patch	Thu Sep  7 15:12:07 2006
@@ -20,7 +20,7 @@
 #
 --- linux-kernel-2.6.12-2.6.12/arch/ppc/boot/Makefile.orig	2005-07-15 12:46:28.000000000 +0000
 +++ linux-kernel-2.6.12-2.6.12/arch/ppc/boot/Makefile	2005-07-15 12:55:56.000000000 +0000
-@@ -32,3 +32,37 @@
+@@ -32,3 +32,25 @@
  $(bootdir-y): $(addprefix $(obj)/,$(subdir-y)) \
  		$(addprefix $(obj)/,$(hostprogs-y))
  	$(Q)$(MAKE) $(build)=$(obj)/$@ $(MAKECMDGOALS)
@@ -29,9 +29,6 @@
 +	# mkvmlinuz support, based on work done originally by Jens Schmalzing <jensen at debian.org>
 +	mkdir -p $(INSTALL_MKVMLINUZ)/boot
 +	install -m 644 ld.script $(INSTALL_MKVMLINUZ)/boot
-+	if [ -e openfirmware/note ]; then \
-+		install -m 644 openfirmware/note $(INSTALL_MKVMLINUZ)/boot; \
-+	fi
 +
 +	mkdir -p $(INSTALL_MKVMLINUZ)/lib
 +	install -m 644 ../../../lib/lib.a $(INSTALL_MKVMLINUZ)/lib
@@ -41,20 +38,11 @@
 +		install -m 644 of1275/lib.a $(INSTALL_MKVMLINUZ)/lib/of.a; \
 +	fi
 +
-+	if [ -e openfirmware/common.o ]; then \
-+		mkdir -p $(INSTALL_MKVMLINUZ)/obj/openfirmware; \
-+		install -m 644 openfirmware/*.o $(INSTALL_MKVMLINUZ)/obj/openfirmware; \
-+		rm -f $(INSTALL_MKVMLINUZ)/obj/openfirmware/image*; \
-+	fi
-+
 +	mkdir -p $(INSTALL_MKVMLINUZ)/obj/simple
 +	install -m 644 simple/*.o $(INSTALL_MKVMLINUZ)/obj/simple
 +	rm -f $(INSTALL_MKVMLINUZ)/obj/simple/image*.o
 +
 +	mkdir -p $(INSTALL_MKVMLINUZ)/utils
-+	install -m 755 utils/addnote $(INSTALL_MKVMLINUZ)/utils
-+	install -m 755 utils/hack-coff $(INSTALL_MKVMLINUZ)/utils
 +	install -m 755 utils/mkbugboot $(INSTALL_MKVMLINUZ)/utils
-+	install -m 755 utils/mknote $(INSTALL_MKVMLINUZ)/utils
 +	install -m 755 utils/mkprep $(INSTALL_MKVMLINUZ)/utils
 +	install -m 755 utils/mktree $(INSTALL_MKVMLINUZ)/utils