tools: Remove -d option from configure.sh
since we can achieve the same effect by passing V=1 to make Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
parent
a54a492dd2
commit
86e47534e6
@ -265,8 +265,6 @@ static void parse_args(int argc, char **argv)
|
||||
|
||||
/* Parse command line options */
|
||||
|
||||
g_debug = false;
|
||||
|
||||
while ((ch = getopt(argc, argv, "a:bcdefghlmnu")) > 0)
|
||||
{
|
||||
switch (ch)
|
||||
@ -805,18 +803,7 @@ static void check_configured(void)
|
||||
{
|
||||
if (g_enforce)
|
||||
{
|
||||
if (g_debug)
|
||||
{
|
||||
run_make("distclean V=1");
|
||||
}
|
||||
else
|
||||
{
|
||||
#ifdef WIN32
|
||||
run_make("distclean");
|
||||
#else
|
||||
run_make("distclean 1>/dev/null");
|
||||
#endif
|
||||
}
|
||||
run_make("distclean");
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -1472,19 +1459,7 @@ static void refresh(void)
|
||||
printf(" Refreshing...\n");
|
||||
fflush(stdout);
|
||||
|
||||
if (g_debug)
|
||||
{
|
||||
ret = run_make("olddefconfig V=1");
|
||||
}
|
||||
else
|
||||
{
|
||||
#ifdef WIN32
|
||||
ret = run_make("olddefconfig");
|
||||
#else
|
||||
ret = run_make("olddefconfig 1>/dev/null");
|
||||
#endif
|
||||
}
|
||||
|
||||
ret = run_make("olddefconfig");
|
||||
putchar('\n');
|
||||
|
||||
#ifdef WEXITSTATUS
|
||||
|
@ -37,10 +37,9 @@ WD=`test -d ${0%/*} && cd ${0%/*}; pwd`
|
||||
TOPDIR="${WD}/.."
|
||||
USAGE="
|
||||
|
||||
USAGE: ${0} [-d] [-e] [-l|m|c|u|g|n] [-a <app-dir>] <board-name>:<config-name> [make-opts]
|
||||
USAGE: ${0} [-e] [-l|m|c|u|g|n] [-a <app-dir>] <board-name>:<config-name> [make-opts]
|
||||
|
||||
Where:
|
||||
-d enables script debug output
|
||||
-e enforce distclean if already configured
|
||||
-l selects the Linux (l) host environment.
|
||||
-m selects the macOS (m) host environment.
|
||||
@ -72,7 +71,6 @@ unset boardconfig
|
||||
unset winnative
|
||||
unset appdir
|
||||
unset host
|
||||
unset debug
|
||||
unset enforce
|
||||
|
||||
while [ ! -z "$1" ]; do
|
||||
@ -89,9 +87,6 @@ while [ ! -z "$1" ]; do
|
||||
winnative=y
|
||||
host+=" $1"
|
||||
;;
|
||||
-d )
|
||||
debug=-d
|
||||
;;
|
||||
-e )
|
||||
enforce=y
|
||||
;;
|
||||
@ -290,4 +285,4 @@ fi
|
||||
# The saved defconfig files are all in compressed format and must be
|
||||
# reconstitued before they can be used.
|
||||
|
||||
${TOPDIR}/tools/sethost.sh $debug $host $*
|
||||
${TOPDIR}/tools/sethost.sh $host $*
|
||||
|
@ -33,17 +33,15 @@
|
||||
#
|
||||
|
||||
progname=$0
|
||||
debug=n
|
||||
host=
|
||||
wenv=
|
||||
|
||||
function showusage {
|
||||
echo ""
|
||||
echo "USAGE: $progname -d [-l|m|c|u|g|n] [make-opts]"
|
||||
echo "USAGE: $progname [-l|m|c|u|g|n] [make-opts]"
|
||||
echo " $progname -h"
|
||||
echo ""
|
||||
echo "Where:"
|
||||
echo " -d enables script debug output"
|
||||
echo " -l|m|c|u|g|n selects Linux (l), macOS (m), Cygwin (c),"
|
||||
echo " Ubuntu under Windows 10 (u), MSYS/MSYS2 (g)"
|
||||
echo " or Windows native (n). Default Linux"
|
||||
@ -56,9 +54,6 @@ function showusage {
|
||||
|
||||
while [ ! -z "$1" ]; do
|
||||
case $1 in
|
||||
-d )
|
||||
debug=y
|
||||
;;
|
||||
-l )
|
||||
host=linux
|
||||
;;
|
||||
@ -216,8 +211,4 @@ fi
|
||||
sed -i -e "/CONFIG_HOST_OTHER/d" $nuttx/.config
|
||||
|
||||
echo " Refreshing..."
|
||||
if [ "X${debug}" = "Xy" ]; then
|
||||
make olddefconfig $* V=1 || { echo "ERROR: failed to refresh"; exit 1; }
|
||||
else
|
||||
make olddefconfig $* 1>/dev/null || { echo "ERROR: failed to refresh"; exit 1; }
|
||||
fi
|
||||
make olddefconfig $* || { echo "ERROR: failed to refresh"; exit 1; }
|
||||
|
Loading…
Reference in New Issue
Block a user