LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: "Américo Wang" <xiyou.wangcong@gmail.com>
To: Mikael Pettersson <mikpe@it.uu.se>
Cc: "Américo Wang" <xiyou.wangcong@gmail.com>,
	"Harald Dunkel" <harri@afaics.de>,
	linux-kernel@vger.kernel.org, linux-kbuild@vger.kenrel.org
Subject: Re: [Patch] make installkernel configurable from command line (was Re: how to avoid that install.sh goes mad, if I am not root?)
Date: Tue, 25 Jan 2011 13:48:00 +0800	[thread overview]
Message-ID: <20110125054800.GC13618@cr0.nay.redhat.com> (raw)
In-Reply-To: <19773.26066.137666.718852@pilspetsen.it.uu.se>

On Mon, Jan 24, 2011 at 12:43:14PM +0100, Mikael Pettersson wrote:
>NAK -- this breaks existing setups which rely on /root/bin/installkernel
>being picked up automatically.
>
>Can you handle 'make INSTALLKERNEL=...' without breaking that please?

Yes, here we go.

--------->

Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>

---
diff --git a/Makefile b/Makefile
index 1f47495..44abded 100644
--- a/Makefile
+++ b/Makefile
@@ -327,7 +327,7 @@ OBJCOPY		= $(CROSS_COMPILE)objcopy
 OBJDUMP		= $(CROSS_COMPILE)objdump
 AWK		= awk
 GENKSYMS	= scripts/genksyms/genksyms
-INSTALLKERNEL  := installkernel
+INSTALLKERNEL  ?= /sbin/installkernel
 DEPMOD		= /sbin/depmod
 KALLSYMS	= scripts/kallsyms
 PERL		= perl
diff --git a/arch/x86/boot/install.sh b/arch/x86/boot/install.sh
index d13ec1c..c8c9a92 100644
--- a/arch/x86/boot/install.sh
+++ b/arch/x86/boot/install.sh
@@ -33,8 +33,8 @@ verify "$3"
 
 # 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/installkernel ]; then exec ~/bin/installkernel "$@"; fi
+if [ -x "${INSTALLKERNEL}" ]; then exec "${INSTALLKERNEL}" "$@"; fi
 
 # Default install - same as make zlilo
 

  reply	other threads:[~2011-01-25  5:48 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-20 19:16 how to avoid that install.sh goes mad, if I am not root? Harald Dunkel
2011-01-20 21:47 ` Mikael Pettersson
2011-01-21 12:49   ` WANG Cong
2011-01-21 22:08     ` Harald Dunkel
2011-01-24 10:21       ` [Patch] make installkernel configurable from command line (was Re: how to avoid that install.sh goes mad, if I am not root?) Américo Wang
2011-01-24 11:43         ` Mikael Pettersson
2011-01-25  5:48           ` Américo Wang [this message]
2011-01-26 10:02             ` Mikael Pettersson
2011-01-28  7:58               ` WANG Cong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110125054800.GC13618@cr0.nay.redhat.com \
    --to=xiyou.wangcong@gmail.com \
    --cc=harri@afaics.de \
    --cc=linux-kbuild@vger.kenrel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mikpe@it.uu.se \
    --subject='Re: [Patch] make installkernel configurable from command line (was Re: how to avoid that install.sh goes mad, if I am not root?)' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).