From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from vs166246.vserver.de (vs166246.vserver.de [62.75.166.246]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTP id 8AAD6DDDDB for ; Thu, 27 Dec 2007 00:55:30 +1100 (EST) From: Michael Buesch To: Andrew Morton Subject: [PATCH] powerpc: Do not fail build if mkimage is not available Date: Wed, 26 Dec 2007 14:53:41 +0100 MIME-Version: 1.0 Message-Id: <200712261453.41849.mb@bu3sch.de> Content-Type: text/plain; charset="us-ascii" Cc: paulus@au.ibm.com, linuxppc-dev@ozlabs.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , This fixes the boot image wrapper script to not fail the kernel build if mkimage is not available. As some distributions don't ship the mkimage program and some people are not interested in uboot images anyway, we don't want to fail the whole kernel build process because of this unneeded dependency. Simply drop an error message, but don't fail the build. Signed-off-by: Michael Buesch --- Josh Boyer is working on merging mkimage into the kernel tree. Until that happened, please merge the patch below into the mainline kernel to avoid build breakage for people without installed uboot tools. Index: wireless-2.6/arch/powerpc/boot/wrapper =================================================================== --- wireless-2.6.orig/arch/powerpc/boot/wrapper 2007-12-23 20:10:07.000000000 +0100 +++ wireless-2.6/arch/powerpc/boot/wrapper 2007-12-23 20:22:41.000000000 +0100 @@ -195,6 +195,14 @@ if [ -n "$version" ]; then fi case "$platform" in +cuboot* | uboot) + if ! [ -x mkimage ]; then + echo "mkimage not available. Can not create $platform image." + exit 0 + fi +esac + +case "$platform" in uboot) rm -f "$ofile" mkimage -A ppc -O linux -T kernel -C gzip -a 00000000 -e 00000000 \