From: Masahiro Yamada <yamada.masahiro@socionext.com>
To: linux-kbuild@vger.kernel.org
Cc: Josh Boyer <jwboyer@redhat.com>,
Darren Hart <dvhart@linux.intel.com>,
john stultz <johnstul@us.ibm.com>, Michal Marek <mmarek@suse.cz>,
Josh Triplett <josh@joshtriplett.org>,
Masahiro Yamada <yamada.masahiro@socionext.com>,
linux-kernel@vger.kernel.org,
"Yann E. MORIN" <yann.morin.1998@free.fr>
Subject: [PATCH 5/6] merge_config.sh: rename MAKE to RUNMAKE
Date: Fri, 13 Mar 2015 15:21:42 +0900 [thread overview]
Message-ID: <1426227703-31815-6-git-send-email-yamada.masahiro@socionext.com> (raw)
In-Reply-To: <1426227703-31815-1-git-send-email-yamada.masahiro@socionext.com>
The variable "MAKE" is used to store the command name that has
invoked the Makefile. (Actually, it is already set to "make"
if you run this script from a Makefile.)
In this script, however, it is used to determine if Make should be
run or not. It is not what we usually expect.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
scripts/kconfig/merge_config.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
index 56584b1..ec8e203 100755
--- a/scripts/kconfig/merge_config.sh
+++ b/scripts/kconfig/merge_config.sh
@@ -35,7 +35,7 @@ usage() {
echo " -O dir to put generated output files"
}
-MAKE=true
+RUNMAKE=true
ALLTARGET=alldefconfig
WARNREDUN=false
OUTPUT=.
@@ -48,7 +48,7 @@ while true; do
continue
;;
"-m")
- MAKE=false
+ RUNMAKE=false
shift
continue
;;
@@ -119,7 +119,7 @@ for MERGE_FILE in $MERGE_LIST ; do
cat $MERGE_FILE >> $TMP_FILE
done
-if [ "$MAKE" = "false" ]; then
+if [ "$RUNMAKE" = "false" ]; then
cp $TMP_FILE $OUTPUT/.config
echo "#"
echo "# merged configuration written to $OUTPUT/.config (needs make)"
--
1.9.1
next prev parent reply other threads:[~2015-03-13 6:22 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-13 6:21 [PATCH 0/6] kbuild: mergeconfig: fix bugs, improve readability, and add generic entry point Masahiro Yamada
2015-03-13 6:21 ` [PATCH 1/6] kbuild: mergeconfig: fix "jobserver unavailable" warning Masahiro Yamada
2015-03-13 6:21 ` [PATCH 2/6] kbuild: mergeconfig: move an error check to merge_config.sh Masahiro Yamada
2015-03-13 6:21 ` [PATCH 3/6] kbuild: mergeconfig: remove redundant $(objtree) Masahiro Yamada
2015-03-13 6:21 ` [PATCH 4/6] merge_config.sh: improve indentation Masahiro Yamada
2015-03-13 6:21 ` Masahiro Yamada [this message]
2015-03-13 6:21 ` [RFC PATCH 6/6] kbuild: add generic mergeconfig target, %.config Masahiro Yamada
2015-03-13 8:27 ` [PATCH 0/6] kbuild: mergeconfig: fix bugs, improve readability, and add generic entry point Josh Triplett
2015-03-13 21:29 ` Darren Hart
2015-03-13 21:29 ` Darren Hart
2015-03-24 15:55 ` Michal Marek
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=1426227703-31815-6-git-send-email-yamada.masahiro@socionext.com \
--to=yamada.masahiro@socionext.com \
--cc=dvhart@linux.intel.com \
--cc=johnstul@us.ibm.com \
--cc=josh@joshtriplett.org \
--cc=jwboyer@redhat.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mmarek@suse.cz \
--cc=yann.morin.1998@free.fr \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.