You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by bt...@apache.org on 2020/04/29 04:28:22 UTC
[incubator-nuttx] branch master updated (9400cf2 -> 97afe1c)
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from 9400cf2 sched/group: On task creation, do not clone uninitialized descriptors.
new d6b24a4 build.yml: Remove -G from cibuild.sh command line
new ea58adb esp32-core/Make.defs: Remove "-MMD -MP" from ARCHCFLAGS
new ee9daea Remove the residual files in the distclean action
new f2f1d4d toots/testbuild.sh: Remove .version manually after distclean
new 2338921 libnx/nxfonts: change the generated file nxfonts_tom-thumb-4x6.c to nxfonts_bitmap_tom-thumb-4x6.c
new 97afe1c tools/refresh.sh: restore BOARD_DIR when refresh with a different host
The 6 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:
.github/workflows/build.yml | 4 ++--
boards/xtensa/esp32/esp32-core/scripts/Make.defs | 2 +-
libs/libnx/nxfonts/Make.defs | 2 +-
libs/libnx/nxfonts/Makefile.sources | 2 +-
tools/Makefile.unix | 4 ++++
tools/Makefile.win | 4 ++++
tools/refresh.sh | 20 +++++++++++++-------
tools/testbuild.sh | 5 +++++
8 files changed, 31 insertions(+), 12 deletions(-)
[incubator-nuttx] 03/06: Remove the residual files in the distclean
action
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit ee9daea58665554440f59659ae07a3b697d4bc58
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun Apr 26 01:08:13 2020 +0800
Remove the residual files in the distclean action
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
tools/Makefile.unix | 4 ++++
tools/Makefile.win | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/tools/Makefile.unix b/tools/Makefile.unix
index f71e91a..a668447 100644
--- a/tools/Makefile.unix
+++ b/tools/Makefile.unix
@@ -387,6 +387,7 @@ clean_context:
$(MAKE) -C $$dir TOPDIR="$(TOPDIR)" clean_context ; \
fi \
done
+ $(call DELFILE, include/float.h)
$(call DELFILE, include/math.h)
$(call DELFILE, include/stdarg.h)
$(call DELFILE, include/setjmp.h)
@@ -612,6 +613,7 @@ clean: subdir_clean
$(call DELDIR, nuttx-export*)
$(call DELFILE, nuttx_user*)
$(call DELDIR, staging)
+ $(call DELFILE, uImage)
$(call CLEAN)
subdir_distclean:
@@ -629,8 +631,10 @@ endif
$(call DELFILE, include/nuttx/version.h)
$(call DELFILE, Make.defs)
$(call DELFILE, defconfig)
+ $(call DELFILE, defconfig.tmp-e)
$(call DELFILE, .config)
$(call DELFILE, .config.old)
+ $(call DELFILE, .config-e)
$(call DELFILE, .gdbinit)
$(Q) $(DIRUNLINK) include/arch/board
$(Q) $(DIRUNLINK) include/arch/chip
diff --git a/tools/Makefile.win b/tools/Makefile.win
index 12f6d05..1b98733 100644
--- a/tools/Makefile.win
+++ b/tools/Makefile.win
@@ -399,6 +399,7 @@ clean_context:
$(Q) for %%G in ($(CCLEANDIRS)) do ( if exist %%G\Makefile $(MAKE) -C %%G TOPDIR="$(TOPDIR)" clean_context )
$(call DELFILE, include\nuttx\config.h)
$(call DELFILE, include\nuttx\version.h)
+ $(call DELFILE, include\float.h)
$(call DELFILE, include\math.h)
$(call DELFILE, include\stdarg.h)
$(call DELFILE, include\setjmp.h)
@@ -590,6 +591,7 @@ clean: subdir_clean
$(call DELFILE, nuttx_user*)
$(call DELFILE, .gdbinit)
$(call DELDIR, staging)
+ $(call DELFILE, uImage)
$(call CLEAN)
subdir_distclean:
@@ -601,8 +603,10 @@ ifeq ($(CONFIG_BUILD_2PASS),y)
endif
$(call DELFILE, Make.defs)
$(call DELFILE, defconfig)
+ $(call DELFILE, defconfig.tmp-e)
$(call DELFILE, .config)
$(call DELFILE, .config.old)
+ $(call DELFILE, .config-e)
$(call DELDIR, include\arch\board)
$(call DELDIR, include\arch\chip)
$(call DELDIR, include\arch)
[incubator-nuttx] 06/06: tools/refresh.sh: restore BOARD_DIR when
refresh with a different host
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 97afe1c40228a8baa96ab993b3832933902aa3f2
Author: liuhaitao <li...@xiaomi.com>
AuthorDate: Tue Apr 28 17:33:24 2020 +0800
tools/refresh.sh: restore BOARD_DIR when refresh with a different host
There is case as below:
When do testbuild under Linux host, such as './tools/configure.sh stmf4discovery:nsh',
arch/arm/src/board is a symlink to boards/arm/stm32/stm32f3discovery/src. Then do
'./tools/refresh.sh --silent stmf4discovery:nsh' after build, it would break the board
symlink with copydir.sh instead of link.sh since defconfig with Windows host config.
So call sethost.sh to restore BOARD_DIR. Or it results in 'make distclean' not correctly.
Signed-off-by: liuhaitao <li...@xiaomi.com>
---
tools/refresh.sh | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/tools/refresh.sh b/tools/refresh.sh
index cbeecfc..e55959f 100755
--- a/tools/refresh.sh
+++ b/tools/refresh.sh
@@ -235,13 +235,13 @@ for CONFIG in ${CONFIGS}; do
# Then run oldconfig or oldefconfig
if [ "X${defaults}" == "Xy" ]; then
- if [ "X${debug}" = "Xy" ]; then
+ if [ "X${debug}" == "Xy" ]; then
make olddefconfig V=1
else
make olddefconfig 1>/dev/null
fi
else
- if [ "X${debug}" = "Xy" ]; then
+ if [ "X${debug}" == "Xy" ]; then
make oldconfig V=1
else
make oldconfig 1>/dev/null
@@ -251,7 +251,7 @@ for CONFIG in ${CONFIGS}; do
# Run savedefconfig to create the new defconfig file
- if [ "X${debug}" = "Xy" ]; then
+ if [ "X${debug}" == "Xy" ]; then
make savedefconfig V=1
else
make savedefconfig 1>/dev/null
@@ -285,14 +285,20 @@ for CONFIG in ${CONFIGS}; do
# Restore any previous .config and Make.defs files
+ if [ -e SAVEMake.defs ]; then
+ mv SAVEMake.defs Make.defs || \
+ { echo "ERROR: Failed to move SAVEMake.defs to Make.defs"; exit 1; }
+ fi
+
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; }
+ if [ "X${debug}" == "Xy" ]; then
+ ./tools/sethost.sh V=1
+ else
+ ./tools/sethost.sh 1>/dev/null
+ fi
fi
done
[incubator-nuttx] 05/06: libnx/nxfonts: change the generated file
nxfonts_tom-thumb-4x6.c to nxfonts_bitmap_tom-thumb-4x6.c
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 23389215bb09b2997c2e29a39b635339c202bf3e
Author: liuhaitao <li...@xiaomi.com>
AuthorDate: Tue Apr 28 14:18:22 2020 +0800
libnx/nxfonts: change the generated file nxfonts_tom-thumb-4x6.c to nxfonts_bitmap_tom-thumb-4x6.c
Align the generated files name, so make distclean could also remove all nxfonts_bitmaps_*.c files, no
need to add one more extra DELFILE for nxfonts_tom-thumb-4x6.c.
Signed-off-by: liuhaitao <li...@xiaomi.com>
---
libs/libnx/nxfonts/Make.defs | 2 +-
libs/libnx/nxfonts/Makefile.sources | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libs/libnx/nxfonts/Make.defs b/libs/libnx/nxfonts/Make.defs
index 538b938..733ae8c 100644
--- a/libs/libnx/nxfonts/Make.defs
+++ b/libs/libnx/nxfonts/Make.defs
@@ -228,7 +228,7 @@ endif
# Tom Thumb mono-space 4x6 font
ifeq ($(CONFIG_NXFONT_TOM_THUMB_4X6),y)
-CSRCS += nxfonts_tom-thumb-4x6.c
+CSRCS += nxfonts_bitmaps_tom-thumb-4x6.c
endif
# Add the nxfont/ directory to the build
diff --git a/libs/libnx/nxfonts/Makefile.sources b/libs/libnx/nxfonts/Makefile.sources
index de70f33..af3b58d 100644
--- a/libs/libnx/nxfonts/Makefile.sources
+++ b/libs/libnx/nxfonts/Makefile.sources
@@ -300,7 +300,7 @@ endif
ifeq ($(NXFONTS_FONTID),43)
NXFONTS_PREFIX := g_tom_thumb_4x6_
-GEN_CSRC = nxfonts_tom-thumb-4x6.c
+GEN_CSRC = nxfonts_bitmaps_tom-thumb-4x6.c
endif
DEPENDENCY := nxfonts_bitmaps.c
[incubator-nuttx] 02/06: esp32-core/Make.defs: Remove "-MMD -MP"
from ARCHCFLAGS
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit ea58adb371aceded32c496d3d8c749a8a0e1f8df
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Wed Apr 29 01:01:30 2020 +0800
esp32-core/Make.defs: Remove "-MMD -MP" from ARCHCFLAGS
since this should be done by makedep program
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
boards/xtensa/esp32/esp32-core/scripts/Make.defs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/boards/xtensa/esp32/esp32-core/scripts/Make.defs b/boards/xtensa/esp32/esp32-core/scripts/Make.defs
index 3ce7a92..44b3ad1 100644
--- a/boards/xtensa/esp32/esp32-core/scripts/Make.defs
+++ b/boards/xtensa/esp32/esp32-core/scripts/Make.defs
@@ -85,7 +85,7 @@ ifneq ($(CONFIG_DEBUG_NOOPT),y)
ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
endif
-ARCHCFLAGS = -fno-builtin -ffunction-sections -fdata-sections -fstrict-volatile-bitfields -mlongcalls -MMD -MP
+ARCHCFLAGS = -fno-builtin -ffunction-sections -fdata-sections -fstrict-volatile-bitfields -mlongcalls
ARCHCXXFLAGS = $(ARCHCFLAGS) -fno-exceptions -fcheck-new -fno-rtti
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
ARCHWARNINGSXX = -Wall -Wshadow -Wundef
[incubator-nuttx] 04/06: toots/testbuild.sh: Remove .version
manually after distclean
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit f2f1d4de85124c185b2356cf30d66df9245e52c3
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Wed Apr 29 00:56:17 2020 +0800
toots/testbuild.sh: Remove .version manually after distclean
since distclean has to keep this file for the release package
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
tools/testbuild.sh | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/tools/testbuild.sh b/tools/testbuild.sh
index 8e67851..91efb53 100755
--- a/tools/testbuild.sh
+++ b/tools/testbuild.sh
@@ -174,6 +174,11 @@ function distclean {
else
makefunc ${JOPTION} distclean
+ # Remove .version manually because this file is shipped with
+ # the release package and then distclean has to keep it
+
+ rm -f .version
+
# Ensure nuttx and apps directory in clean state even with --ignored
if [ -d $nuttx/.git ] || [ -d $APPSDIR/.git ]; then
[incubator-nuttx] 01/06: build.yml: Remove -G from cibuild.sh
command line
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit d6b24a41243e8016297c093fadcaf4a45399ffb5
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Wed Apr 22 01:31:45 2020 +0800
build.yml: Remove -G from cibuild.sh command line
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
.github/workflows/build.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d59c9e0..9913fd3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -170,7 +170,7 @@ jobs:
run: |
git -C sources/nuttx fetch --tags
cd sources/testing
- ./cibuild.sh -x -G testlist/${{matrix.boards}}.dat
+ ./cibuild.sh -x testlist/${{matrix.boards}}.dat
macOS:
runs-on: macos-10.15
@@ -211,4 +211,4 @@ jobs:
run: |
git -C sources/nuttx fetch --tags
cd sources/testing
- ./cibuild.sh -i -x -G testlist/${{matrix.boards}}.dat
+ ./cibuild.sh -i -x testlist/${{matrix.boards}}.dat