r4371 - dists/trunk/linux-2.6/debian/patches-debian

Sven Luther luther at costa.debian.org
Mon Oct 10 13:40:52 UTC 2005


Author: luther
Date: 2005-10-10 13:40:46 +0000 (Mon, 10 Oct 2005)
New Revision: 4371

Modified:
   dists/trunk/linux-2.6/debian/patches-debian/powerpc-mkvmlinuz-support.patch
Log:
Well, when mkvmllinuz-support stuff is called, CONFIG_APUS is not defined.


Modified: dists/trunk/linux-2.6/debian/patches-debian/powerpc-mkvmlinuz-support.patch
===================================================================
--- dists/trunk/linux-2.6/debian/patches-debian/powerpc-mkvmlinuz-support.patch	2005-10-10 09:37:18 UTC (rev 4370)
+++ dists/trunk/linux-2.6/debian/patches-debian/powerpc-mkvmlinuz-support.patch	2005-10-10 13:40:46 UTC (rev 4371)
@@ -20,16 +20,18 @@
 #
 --- 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,32 @@
+@@ -32,3 +32,35 @@
  $(bootdir-y): $(addprefix $(obj)/,$(subdir-y)) \
  		$(addprefix $(obj)/,$(hostprogs-y))
  	$(Q)$(MAKE) $(build)=$(obj)/$@ $(MAKECMDGOALS)
 +
 +mkvmlinuz_support_install:
-+ifndef CONFIG_APUS
 +	# mkvmlinuz support, based on work done originally by Jens Schmalzing <jensen at debian.org>
 +	mkdir -p $(INSTALL_MKVMLINUZ)/boot
-+	install -m 644 -o root -g root ld.script openfirmware/note $(INSTALL_MKVMLINUZ)/boot
++	install -m 644 -o root -g root ld.script $(INSTALL_MKVMLINUZ)/boot
++	if [ -e openfirmware/note ]; then \
++		install -m 644 -o root -g root openfirmware/note $(INSTALL_MKVMLINUZ)/boot \
++	fi
 +
 +	mkdir -p $(INSTALL_MKVMLINUZ)/lib
 +	install -m 644 -o root -g root ../../../lib/lib.a $(INSTALL_MKVMLINUZ)/lib
@@ -37,9 +39,11 @@
 +	install -m 644 -o root -g root common/lib.a $(INSTALL_MKVMLINUZ)/lib/common.a
 +	install -m 644 -o root -g root of1275/lib.a $(INSTALL_MKVMLINUZ)/lib/of.a
 +
-+	mkdir -p $(INSTALL_MKVMLINUZ)/obj/openfirmware
-+	install -m 644 -o root -g root openfirmware/*.o $(INSTALL_MKVMLINUZ)/obj/openfirmware
-+	rm -f $(INSTALL_MKVMLINUZ)/obj/openfirmware/image*
++	if [ -e common.o ]; \	
++		mkdir -p $(INSTALL_MKVMLINUZ)/obj/openfirmware \
++		install -m 644 -o root -g root openfirmware/*.o $(INSTALL_MKVMLINUZ)/obj/openfirmware \
++		rm -f $(INSTALL_MKVMLINUZ)/obj/openfirmware/image* \
++	fi
 +
 +	mkdir -p $(INSTALL_MKVMLINUZ)/obj/simple
 +	install -m 644 -o root -g root simple/*.o $(INSTALL_MKVMLINUZ)/obj/simple
@@ -52,4 +56,3 @@
 +	install -m 755 -o root -g root utils/mknote $(INSTALL_MKVMLINUZ)/utils
 +	install -m 755 -o root -g root utils/mkprep $(INSTALL_MKVMLINUZ)/utils
 +	install -m 755 -o root -g root utils/mktree $(INSTALL_MKVMLINUZ)/utils
-+endif




More information about the Kernel-svn-changes mailing list