Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f8e2d62 authored by Ian Campbell's avatar Ian Campbell Committed by Linus Torvalds
Browse files

[PATCH] use ${CROSS_COMPILE}installkernel in arch/*/boot/install.sh 



The attached patch causes the various arch specific install.sh scripts to
look for ${CROSS_COMPILE}installkernel rather than just installkernel (in
both /sbin/ and ~/bin/ where the script already did this).  This allows you
to have e.g.  arm-linux-installkernel as a handy way to install on your
cross target.  It also prevents the script picking up on the host
/sbin/installkernel which causes the script to fall through and do the
install itself (which is what I actually use myself, with $INSTALL_PATH
set).

I don't believe it causes back-compatibility problems since calling the
host installkernel was never likely to work or be what you wanted when
cross compiling anyway.  If $CROSS_COMPILE isn't set then nothing changes.

I only use ARM and i386 myself but I figured it couldn't hurt to do the
whole lot.  I've cc'd those who I hope are the arch maintainers for files
that I've touched.

Signed-off-by: default avatarIan Campbell <icampbell@arcom.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d0e7feb0

arch/arm/boot/install.sh

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ 
#



# User may have a custom install script

if [ -x ~/bin/installkernel ]; then exec ~/bin/installkernel "$@"; fi

if [ -x /sbin/installkernel ]; then exec /sbin/installkernel "$@"; fi

if [ -x ~/bin/${CROSS_COMPILE}installkernel ]; then exec ~/bin/${CROSS_COMPILE}installkernel "$@"; fi

if [ -x /sbin/${CROSS_COMPILE}installkernel ]; then exec /sbin/${CROSS_COMPILE}installkernel "$@"; fi



if [ "$(basename $2)" = "zImage" ]; then

# Compressed install

arch/arm26/boot/install.sh

+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ 


# User may have a custom install script



if [ -x /sbin/installkernel ]; then

  exec /sbin/installkernel "$@"

if [ -x /sbin/${CROSS_COMPILE}installkernel ]; then

  exec /sbin/${CROSS_COMPILE}installkernel "$@"

fi



if [ "$2" = "zImage" ]; then

arch/i386/boot/install.sh

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ 


# User may have a custom install script



if [ -x ~/bin/installkernel ]; then exec ~/bin/installkernel "$@"; fi

if [ -x /sbin/installkernel ]; then exec /sbin/installkernel "$@"; fi

if [ -x ~/bin/${CROSS_COMPILE}installkernel ]; then exec ~/bin/${CROSS_COMPILE}installkernel "$@"; fi

if [ -x /sbin/${CROSS_COMPILE}installkernel ]; then exec /sbin/${CROSS_COMPILE}installkernel "$@"; fi



# Default install - same as make zlilo

arch/ppc64/boot/install.sh

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 


# User may have a custom install script



if [ -x ~/bin/installkernel ]; then exec ~/bin/installkernel "$@"; fi

if [ -x /sbin/installkernel ]; then exec /sbin/installkernel "$@"; fi

if [ -x ~/bin/${CROSS_COMPILE}installkernel ]; then exec ~/bin/${CROSS_COMPILE}installkernel "$@"; fi

if [ -x /sbin/${CROSS_COMPILE}installkernel ]; then exec /sbin/${CROSS_COMPILE}installkernel "$@"; fi



# Default install

arch/s390/boot/install.sh

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ 


# User may have a custom install script



if [ -x ~/bin/installkernel ]; then exec ~/bin/installkernel "$@"; fi

if [ -x /sbin/installkernel ]; then exec /sbin/installkernel "$@"; fi

if [ -x ~/bin/${CROSS_COMPILE}installkernel ]; then exec ~/bin/${CROSS_COMPILE}installkernel "$@"; fi

if [ -x /sbin/${CROSS_COMPILE}installkernel ]; then exec /sbin/${CROSS_COMPILE}installkernel "$@"; fi



# Default install - same as make zlilo