[patch] search a little harder for mkimage

[patch] search a little harder for mkimage

[Mike Frysinger]

[-- Attachment #1: Type: text/plain, Size: 278 bytes --]

this small patch checks to see if `${CROSS_COMPILE}mkimage` exists and
if not, fall back to the standard `mkimage`

the Blackfin toolchain includes mkimage, but we dont want to namespace
collide with any of the user's system setup, so we prefix it with our
toolchain name
-mike

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: check-cross-compile-mkimage.patch --]
[-- Type: text/x-patch; name="check-cross-compile-mkimage.patch", Size: 708 bytes --]

Check to see if the mkimage tool is part of the cross-compile toolchain.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

--- a/linux-2.6/scripts/mkuboot.sh
+++ b/linux-2.6/scripts/mkuboot.sh
@@ -4,12 +4,15 @@
 # Build U-Boot image when `mkimage' tool is available.
 #
 
-MKIMAGE=$(type -path mkimage)
+MKIMAGE=$(type -path ${CROSS_COMPILE}mkimage)
 
 if [ -z "${MKIMAGE}" ]; then
-	# Doesn't exist
-	echo '"mkimage" command not found - U-Boot images will not be built' >&2
-	exit 0;
+	MKIMAGE=$(type -path mkimage)
+	if [ -z "${MKIMAGE}" ]; then
+		# Doesn't exist
+		echo '"mkimage" command not found - U-Boot images will not be built' >&2
+		exit 0;
+	fi
 fi
 
 # Call "mkimage" to create U-Boot image

Re: [patch] search a little harder for mkimage

[Andrew Morton]

On Tue, 19 Dec 2006 00:20:42 -0500
"Mike Frysinger" <vapier.adi@gmail.com> wrote:

> this small patch checks to see if `${CROSS_COMPILE}mkimage` exists and
> if not, fall back to the standard `mkimage`
> 
> the Blackfin toolchain includes mkimage, but we dont want to namespace
> collide with any of the user's system setup, so we prefix it with our
> toolchain name
> -mike
> 
> 
> [check-cross-compile-mkimage.patch  text/x-patch (708B)]
> Check to see if the mkimage tool is part of the cross-compile toolchain.
> 
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> 
> --- a/linux-2.6/scripts/mkuboot.sh
> +++ b/linux-2.6/scripts/mkuboot.sh
> @@ -4,12 +4,15 @@
>  # Build U-Boot image when `mkimage' tool is available.
>  #
>  
> -MKIMAGE=$(type -path mkimage)
> +MKIMAGE=$(type -path ${CROSS_COMPILE}mkimage)

Do all bash versions support `type -path'?

Perhaps /usr/bin/which would be safer, dunno.

Re: [patch] search a little harder for mkimage

[Mike Frysinger]

On 12/19/06, Andrew Morton <akpm@osdl.org> wrote:
> > -MKIMAGE=$(type -path mkimage)
> > +MKIMAGE=$(type -path ${CROSS_COMPILE}mkimage)
>
> Do all bash versions support `type -path'?

i've just always used `type -p` myself ...

but, bash-2.05 supports it for sure and that was released back in 2001 ...

> Perhaps /usr/bin/which would be safer, dunno.

which can be tricky as it behaves a little differently on some
platforms and may not always even be installed ... OS X for example is
notorious for being a piece of crap ... `which asdfasdf` will echo the
error to stdout and exit with a status of 0 even though the test
obviously failed
-mike