You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gn...@apache.org on 2020/03/19 13:51:59 UTC
[incubator-nuttx] branch pr589 updated (73b655f -> bb3ddab)
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a change to branch pr589
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from 73b655f stm32h7_qspi: support for custom clock (not just HCLK) and support for DUAL/QUAD commands (#582)
new 895e456 tools: Make sethost.sh can be invoke from any directory
new 2e81051 tools/sethost.sh: Don't make clean_context explicitly
new b109c92 tools/sethost.sh: Remove <config> argument
new b19aaa3 tools/refresh.sh: Should detect Make.defs from config folder first
new bb3ddab tools/refresh.sh: Invoke make with V=1 if receiving -d option
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
tools/README.txt | 3 +-
tools/configure.sh | 4 +--
tools/refresh.sh | 40 ++++++++++++++++---------
tools/sethost.sh | 88 +++++++-----------------------------------------------
4 files changed, 38 insertions(+), 97 deletions(-)
[incubator-nuttx] 05/05: tools/refresh.sh: Invoke make with V=1 if
receiving -d option
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch pr589
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit bb3ddab4130f53ba3e294d863bb11dff3b526c78
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Thu Mar 19 13:43:30 2020 +0800
tools/refresh.sh: Invoke make with V=1 if receiving -d option
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
Change-Id: I8fda13c3faa955a771efd6841e0da09f8e4d8303
---
tools/refresh.sh | 29 ++++++++++++++++++++++-------
1 file changed, 22 insertions(+), 7 deletions(-)
diff --git a/tools/refresh.sh b/tools/refresh.sh
index 3765316..14a9a6e 100755
--- a/tools/refresh.sh
+++ b/tools/refresh.sh
@@ -38,6 +38,7 @@ USAGE="USAGE: $0 [options] <board>:<config>"
ADVICE="Try '$0 --help' for more information"
unset CONFIGS
+debug=n
defaults=n
prompt=y
nocopy=n
@@ -45,6 +46,7 @@ nocopy=n
while [ ! -z "$1" ]; do
case $1 in
--debug )
+ debug=y
set -x
;;
--silent )
@@ -233,23 +235,36 @@ for CONFIG in ${CONFIGS}; do
# Then run oldconfig or oldefconfig
if [ "X${defaults}" == "Xy" ]; then
- make olddefconfig
+ if [ "X${debug}" = "Xy" ]; then
+ make olddefconfig V=1
+ else
+ make olddefconfig 1>/dev/null 2>&1
+ fi
else
- make oldconfig
+ if [ "X${debug}" = "Xy" ]; then
+ make oldconfig V=1
+ else
+ make oldconfig
+ fi
fi
fi
# Run savedefconfig to create the new defconfig file
- make savedefconfig
-
- # Show differences
-
- $CMPCONFIG $DEFCONFIG defconfig
+ if [ "X${debug}" = "Xy" ]; then
+ make savedefconfig V=1
+ else
+ make savedefconfig 1>/dev/null 2>&1
+ fi
# Save the refreshed configuration
if [ "X${prompt}" == "Xy" ]; then
+
+ # Show differences
+
+ $CMPCONFIG $DEFCONFIG defconfig
+
read -p "Save the new configuration (y/n)?" -n 1 -r
echo
if [[ $REPLY =~ ^[Yy]$ ]]
[incubator-nuttx] 01/05: tools: Make sethost.sh can be invoke from
any directory
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch pr589
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 895e456a0428200214e78a2be76f03966b605b40
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Thu Mar 19 10:41:36 2020 +0800
tools: Make sethost.sh can be invoke from any directory
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
Change-Id: I15234df8591a0f22837c72d4e9203da5f05d0f74
---
tools/configure.sh | 4 +---
tools/sethost.sh | 3 +++
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/tools/configure.sh b/tools/configure.sh
index a90517d..6455fc4 100755
--- a/tools/configure.sh
+++ b/tools/configure.sh
@@ -282,6 +282,4 @@ fi
# The saved defconfig files are all in compressed format and must be
# reconstitued before they can be used.
-cd ${TOPDIR} || { echo "Failed to cd to ${TOPDIR}"; exit 10; }
-
-./tools/sethost.sh $debug $host
+${TOPDIR}/tools/sethost.sh $debug $host
diff --git a/tools/sethost.sh b/tools/sethost.sh
index 5a75885..8ebac02 100755
--- a/tools/sethost.sh
+++ b/tools/sethost.sh
@@ -125,6 +125,9 @@ if [ ! -z "$1" ]; then
showusage
fi
+WD=`test -d ${0%/*} && cd ${0%/*}; pwd`
+cd $WD
+
if [ -x sethost.sh ]; then
nuttx=$PWD/..
else
[incubator-nuttx] 04/05: tools/refresh.sh: Should detect Make.defs
from config folder first
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch pr589
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit b19aaa342bfa7f9e2c54651a072dc5f2bafd5f36
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Thu Mar 19 10:56:42 2020 +0800
tools/refresh.sh: Should detect Make.defs from config folder first
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
Change-Id: Ie45d94fb97ea9a17d6fffb42c4ae03b2a6f08459
---
tools/refresh.sh | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/tools/refresh.sh b/tools/refresh.sh
index d217b76..3765316 100755
--- a/tools/refresh.sh
+++ b/tools/refresh.sh
@@ -38,7 +38,6 @@ USAGE="USAGE: $0 [options] <board>:<config>"
ADVICE="Try '$0 --help' for more information"
unset CONFIGS
-silent=n
defaults=n
prompt=y
nocopy=n
@@ -49,7 +48,6 @@ while [ ! -z "$1" ]; do
set -x
;;
--silent )
- silent=y
defaults=y
prompt=n
;;
@@ -199,11 +197,11 @@ for CONFIG in ${CONFIGS}; do
exit 1
fi
- if [ -r $MAKEDEFS1 ]; then
- MAKEDEFS=$MAKEDEFS1
+ if [ -r $MAKEDEFS2 ]; then
+ MAKEDEFS=$MAKEDEFS2
else
- if [ -r $MAKEDEFS2 ]; then
- MAKEDEFS=$MAKEDEFS2
+ if [ -r $MAKEDEFS1 ]; then
+ MAKEDEFS=$MAKEDEFS1
else
echo "No readable Make.defs file at $MAKEDEFS1 or $MAKEDEFS2"
exit 1
@@ -247,7 +245,6 @@ for CONFIG in ${CONFIGS}; do
# Show differences
- # sed -i -e "s/^CONFIG_APPS_DIR/# CONFIG_APPS_DIR/g" defconfig
$CMPCONFIG $DEFCONFIG defconfig
# Save the refreshed configuration
[incubator-nuttx] 02/05: tools/sethost.sh: Don't make clean_context
explicitly
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch pr589
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 2e81051b40d6c3572a1e6f40c4d89eb1912771a2
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Thu Mar 19 11:44:16 2020 +0800
tools/sethost.sh: Don't make clean_context explicitly
since olddefconfig will do this automatically
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
Change-Id: I3376fc3fa5fff06b37871837261e31d9b0103cae
---
tools/sethost.sh | 1 -
1 file changed, 1 deletion(-)
diff --git a/tools/sethost.sh b/tools/sethost.sh
index 8ebac02..4e776ab 100755
--- a/tools/sethost.sh
+++ b/tools/sethost.sh
@@ -271,7 +271,6 @@ sed -i -e "/CONFIG_HOST_OTHER/d" $nuttx/.config
echo " Refreshing..."
cd $nuttx || { echo "ERROR: failed to cd to $nuttx"; exit 1; }
-make clean_context 1>/dev/null 2>&1
if [ "X${debug}" = "Xy" ]; then
make olddefconfig V=1 || { echo "ERROR: failed to refresh"; exit 1; }
else
[incubator-nuttx] 03/05: tools/sethost.sh: Remove argument
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch pr589
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit b109c92043077d05e2e861f8baeaa203b42af5f9
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Thu Mar 19 11:47:34 2020 +0800
tools/sethost.sh: Remove <config> argument
since this argument generate the expanding(deprecated) defconfig
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
Change-Id: I16fe3634b23c97209f5b28fd54d10f60913aa3df
---
tools/README.txt | 3 +-
tools/sethost.sh | 84 +++++---------------------------------------------------
2 files changed, 8 insertions(+), 79 deletions(-)
diff --git a/tools/README.txt b/tools/README.txt
index 52d51e0..fcf4b75 100644
--- a/tools/README.txt
+++ b/tools/README.txt
@@ -940,7 +940,7 @@ sethost.sh
$ ./sethost.sh -h
- USAGE: ./sethost.sh [-l|m|c|u|g|n] [<config>]
+ USAGE: ./sethost.sh [-l|m|c|u|g|n]
./sethost.sh -h
Where:
@@ -948,7 +948,6 @@ sethost.sh
Ubuntu under Windows 10 (u), MSYS/MSYS2 (g)
or Windows native (n). Default Linux
-h will show this help test and terminate
- <config> selects configuration file. Default: .config
simhostroute.sh
---------------
diff --git a/tools/sethost.sh b/tools/sethost.sh
index 4e776ab..2d2bd18 100755
--- a/tools/sethost.sh
+++ b/tools/sethost.sh
@@ -36,11 +36,10 @@ progname=$0
debug=n
host=
wenv=
-unset configfile
function showusage {
echo ""
- echo "USAGE: $progname -d [-l|m|c|u|g|n] [<config>]"
+ echo "USAGE: $progname -d [-l|m|c|u|g|n]"
echo " $progname -h"
echo ""
echo "Where:"
@@ -49,7 +48,6 @@ function showusage {
echo " Ubuntu under Windows 10 (u), MSYS/MSYS2 (g)"
echo " or Windows native (n). Default Linux"
echo " -h will show this help test and terminate"
- echo " <config> selects configuration file. Default: .config"
exit 1
}
@@ -86,8 +84,6 @@ while [ ! -z "$1" ]; do
showusage
;;
* )
- configfile="$1"
- shift
break;
;;
esac
@@ -139,60 +135,14 @@ else
fi
fi
-rm -f $nuttx/SAVEconfig
-rm -f $nuttx/SAVEMake.defs
-
-unset dotconfig
-if [ -z "$configfile" ]; then
- dotconfig=y
-else
- if [ "X$configfile" = "X.config" ]; then
- dotconfig=y
- else
- if [ "X$configfile" = "X$nuttx/.config" ]; then
- dotconfig=y
- fi
- fi
+if [ ! -r $nuttx/.config ]; then
+ echo "There is no .config at $nuttx"
+ exit 1
fi
-if [ "X$dotconfig" = "Xy" ]; then
- unset configfile
- if [ -r $nuttx/.config ]; then
- configfile=$nuttx/.config
- else
- echo "There is no .config at $nuttx"
- exit 1
- fi
-
- if [ ! -r $nuttx/Make.defs ]; then
- echo "ERROR: No readable Make.defs file exists at $nuttx"
- exit 1
- fi
-else
- if [ ! -r "$configfile" ]; then
- echo "ERROR: No readable configuration file exists at $configfile"
- exit 1
- fi
-
- configdir=`dirname $configfile`
- makedefs=$configdir/Make.defs
-
- if [ ! -r $makedefs ]; then
- echo "ERROR: No readable Make.defs file exists at $configdir"
- exit 1
- fi
-
- if [ -f $nuttx/.config ]; then
- mv $nuttx/.config $nuttx/SAVEconfig
- fi
- cp $configfile $nuttx/.config || \
- { echo "ERROR: cp to $nuttx/.config failed"; exit 1; }
-
- if [ -f $nuttx/Make.defs ]; then
- mv $nuttx/Make.defs $nuttx/SAVEMake.defs
- fi
- cp $makedefs $nuttx/Make.defs || \
- { echo "ERROR: cp to $nuttx/Make.defs failed"; exit 1; }
+if [ ! -r $nuttx/Make.defs ]; then
+ echo "ERROR: No readable Make.defs file exists at $nuttx"
+ exit 1
fi
# Modify the configuration
@@ -276,23 +226,3 @@ if [ "X${debug}" = "Xy" ]; then
else
make olddefconfig 1>/dev/null || { echo "ERROR: failed to refresh"; exit 1; }
fi
-
-# Move config file to correct location and restore any previous .config
-# and Make.defs files
-
-if [ "X$dotconfig" != "Xy" ]; then
- sed -i -e "s/^CONFIG_APPS_DIR/# CONFIG_APPS_DIR/g" .config
-
- mv .config $configfile || \
- { echo "ERROR: Failed to move .config to $configfile"; exit 1; }
-
- if [ -e SAVEconfig ]; then
- mv SAVEconfig .config || \
- { echo "ERROR: Failed to move SAVEconfig to .config"; exit 1; }
- fi
-
- if [ -e SAVEMake.defs ]; then
- mv SAVEMake.defs Make.defs || \
- { echo "ERROR: Failed to move SAVEMake.defs to Make.defs"; exit 1; }
- fi
-fi