You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ma...@apache.org on 2020/10/30 06:05:34 UTC
[incubator-nuttx] branch releases/10.0 updated (8d1fc32 -> aed24af)
This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a change to branch releases/10.0
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from 8d1fc32 arch/sim: Enable SIM_WALLTIME option by default
new cb314a4 tools: Remove the special handle for Ubuntu under Windows 10
new 6482d4f tools/testbuild.sh: Don't support to change size_t type in datlist
new 6be4d00 tools/testbuild.sh: Support regular expression in blacklist
new 730037b build.yml: Switch avr-mips-riscv-x86-xtensa.dat to other.dat
new 1136f38 tools: cxd56: mkspk: automate mkspk build
new d750dbf CI: Store artifacts durring build
new 68ed44c build: Fix testbuild.sh artifact copy on macOS
new aed24af RX65N ipv6 defconfig modified
The 8 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 | 18 ++-
Documentation/quickstart/configuring.rst | 1 -
Kconfig | 6 -
TODO | 21 +---
arch/mips/src/mips32/Kconfig | 2 +-
boards/arm/cxd56xx/spresense/scripts/Make.defs | 2 +-
boards/arm/stm32l4/b-l475e-iot01a/README.txt | 6 +-
.../rx65n/rx65n-grrose/configs/ipv6/defconfig | 123 +++++++-------------
.../rx65n/rx65n-rsk2mb/configs/ipv6/defconfig | 108 +++++++-----------
boards/xtensa/esp32/esp32-core/scripts/Config.mk | 1 +
tools/Config.mk | 2 -
tools/Makefile.host | 1 +
tools/Makefile.unix | 6 +
tools/Makefile.win | 5 +
tools/README.txt | 24 ++--
tools/configure.bat | 7 +-
tools/configure.c | 26 +----
tools/configure.sh | 5 +-
.../spresense/scripts => tools/cxd56}/Config.mk | 21 ++--
tools/cxd56/{Makefile => Makefile.host} | 2 +-
tools/sethost.sh | 20 +---
tools/testbuild.sh | 125 ++++++++++++---------
22 files changed, 220 insertions(+), 312 deletions(-)
rename {boards/arm/cxd56xx/spresense/scripts => tools/cxd56}/Config.mk (75%)
rename tools/cxd56/{Makefile => Makefile.host} (98%)
[incubator-nuttx] 03/08: tools/testbuild.sh: Support regular
expression in blacklist
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a commit to branch releases/10.0
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 6be4d00c147739b4f42bf468e30bdf9924f065b2
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Tue Oct 27 01:44:23 2020 +0800
tools/testbuild.sh: Support regular expression in blacklist
and prepend 'uname -s' to config for filtering config by host
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
tools/README.txt | 5 +++-
tools/testbuild.sh | 87 +++++++++++++++++++++++++++++++++---------------------
2 files changed, 58 insertions(+), 34 deletions(-)
diff --git a/tools/README.txt b/tools/README.txt
index 7282d0d..fc04784 100644
--- a/tools/README.txt
+++ b/tools/README.txt
@@ -1040,7 +1040,10 @@ testbuild.sh
configured board.
The prefix '-' can be used to skip a configuration:
- -stm32f429i-disco/nsh,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+ -stm32f429i-disco/nsh
+
+ or skip a configuration on a specific host(e.g. Darwin):
+ -Darwin,sim:rpserver
uncrustify.cfg
--------------
diff --git a/tools/testbuild.sh b/tools/testbuild.sh
index afc27bc..b974e98 100755
--- a/tools/testbuild.sh
+++ b/tools/testbuild.sh
@@ -47,6 +47,23 @@ unset JOPTION
PRINTLISTONLY=0
GITCLEAN=0
+case $(uname -s) in
+ Darwin*)
+ HOST=Darwin
+ ;;
+ CYGWIN*)
+ HOST=Cygwin
+ ;;
+ MINGW32*)
+ HOST=MinGw
+ ;;
+ *)
+
+ # Assume linux as a fallback
+ HOST=Linux
+ ;;
+esac
+
function showusage {
echo ""
echo "USAGE: $progname [-l|m|c|g|n] [-d] [-e <extraflags>] [-x] [-j <ncpus>] [-a <appsdir>] [-t <topdir>] [-p] [-G] <testlist-file>"
@@ -258,51 +275,55 @@ function build {
function dotest {
echo "===================================================================================="
config=`echo $1 | cut -d',' -f1`
- re="-${config/\//:}[[:space:]]"
- if [[ "${blacklist} " =~ $re ]]; then
- echo "Skipping: $1"
- else
- echo "Configuration/Tool: $1"
- if [ ${PRINTLISTONLY} -eq 1 ]; then
+ check=${HOST},${config/\//:}
+
+ for re in $blacklist; do
+ if [[ "${check}" =~ ${re:1}$ ]]; then
+ echo "Skipping: $1"
return
fi
+ done
- # Parse the next line
+ echo "Configuration/Tool: $1"
+ if [ ${PRINTLISTONLY} -eq 1 ]; then
+ return
+ fi
- configdir=`echo $config | cut -s -d':' -f2`
+ # Parse the next line
+
+ configdir=`echo $config | cut -s -d':' -f2`
+ if [ -z "${configdir}" ]; then
+ configdir=`echo $config | cut -s -d'/' -f2`
if [ -z "${configdir}" ]; then
- configdir=`echo $config | cut -s -d'/' -f2`
- if [ -z "${configdir}" ]; then
- echo "ERROR: Malformed configuration: ${config}"
- showusage
- else
- boarddir=`echo $config | cut -d'/' -f1`
- fi
+ echo "ERROR: Malformed configuration: ${config}"
+ showusage
else
- boarddir=`echo $config | cut -d':' -f1`
+ boarddir=`echo $config | cut -d'/' -f1`
fi
+ else
+ boarddir=`echo $config | cut -d':' -f1`
+ fi
- path=$nuttx/boards/*/*/$boarddir/configs/$configdir
- if [ ! -r $path/defconfig ]; then
- echo "ERROR: no configuration found at $path"
- showusage
- fi
+ path=$nuttx/boards/*/*/$boarddir/configs/$configdir
+ if [ ! -r $path/defconfig ]; then
+ echo "ERROR: no configuration found at $path"
+ showusage
+ fi
- unset toolchain
- if [ "X$config" != "X$1" ]; then
- toolchain=`echo $1 | cut -d',' -f2`
- if [ -z "$toolchain" ]; then
- echo " Warning: no tool configuration"
- fi
+ unset toolchain
+ if [ "X$config" != "X$1" ]; then
+ toolchain=`echo $1 | cut -d',' -f2`
+ if [ -z "$toolchain" ]; then
+ echo " Warning: no tool configuration"
fi
+ fi
- # Perform the build test
+ # Perform the build test
- echo "------------------------------------------------------------------------------------"
- distclean
- configure
- build
- fi
+ echo "------------------------------------------------------------------------------------"
+ distclean
+ configure
+ build
}
# Perform the build test for each entry in the test list file
[incubator-nuttx] 05/08: tools: cxd56: mkspk: automate mkspk build
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a commit to branch releases/10.0
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 1136f388ce96761651310cea354c33dc1239d26e
Author: Alin Jerpelea <al...@sony.com>
AuthorDate: Wed Oct 28 09:39:59 2020 +0100
tools: cxd56: mkspk: automate mkspk build
the mkspk tool will automaticaly be built if CONFIG_CXD56_BINARY
is set.
Test:
nuttx.spk was succesfully generated
Signed-off-by: Alin Jerpelea <al...@sony.com>
---
boards/arm/cxd56xx/spresense/scripts/Make.defs | 2 +-
tools/Makefile.host | 1 +
.../spresense/scripts => tools/cxd56}/Config.mk | 21 +++++++++------------
tools/cxd56/{Makefile => Makefile.host} | 2 +-
4 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/boards/arm/cxd56xx/spresense/scripts/Make.defs b/boards/arm/cxd56xx/spresense/scripts/Make.defs
index 142e277..dae9247 100644
--- a/boards/arm/cxd56xx/spresense/scripts/Make.defs
+++ b/boards/arm/cxd56xx/spresense/scripts/Make.defs
@@ -35,7 +35,7 @@
include $(TOPDIR)/.config
include $(TOPDIR)/tools/Config.mk
-include $(TOPDIR)/boards/arm/cxd56xx/spresense/scripts/Config.mk
+include $(TOPDIR)/tools/cxd56/Config.mk
include $(TOPDIR)/arch/arm/src/armv7-m/Toolchain.defs
# Setup for the kind of memory that we are executing from
diff --git a/tools/Makefile.host b/tools/Makefile.host
index 3417a94..adf2686 100644
--- a/tools/Makefile.host
+++ b/tools/Makefile.host
@@ -261,6 +261,7 @@ ifneq ($(CONFIG_WINDOWS_NATIVE),y)
$(Q) rm -rf *.dSYM
endif
$(Q) $(MAKE) -C pic32 -f Makefile.host clean
+ $(Q) $(MAKE) -C cxd56 -f Makefile.host clean
$(call DELFILE, incdir)
$(call DELFILE, incdir.exe)
$(call CLEAN)
diff --git a/boards/arm/cxd56xx/spresense/scripts/Config.mk b/tools/cxd56/Config.mk
similarity index 75%
rename from boards/arm/cxd56xx/spresense/scripts/Config.mk
rename to tools/cxd56/Config.mk
index 8c9bd3b..a6456a8 100644
--- a/boards/arm/cxd56xx/spresense/scripts/Config.mk
+++ b/tools/cxd56/Config.mk
@@ -1,5 +1,5 @@
############################################################################
-# board/arm/cxd56xx/spresense/script/Config.mk
+# tools/cxd56/Config.mk
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -24,18 +24,15 @@
# POSTBUILD -- Perform post build operations
+
ifeq ($(CONFIG_CXD56_BINARY),y)
+
define POSTBUILD
- $(Q) if [ ! -f "tools/cxd56/mkspk" ] ; then \
- echo ""; \
- echo "Please run the following command to build the needed tool"; \
- echo ""; \
- echo "cd tools/cxd56 && make && cd ../.."; \
- echo ""; \
- echo "run make again to create the nuttx.spk image."; \
- else \
- echo "Generating: $(NUTTXNAME).spk"; \
- tools/cxd56/mkspk -c2 nuttx nuttx nuttx.spk; \
- fi
+ $(Q)echo "Generating: $(NUTTXNAME).spk"; \
+
+ +$(Q) $(MAKE) -C $(TOPDIR)$(DELIM)tools$(DELIM)cxd56 -f Makefile.host
+ tools$(DELIM)cxd56$(DELIM)mkspk$(HOSTEXEEXT) -c2 nuttx nuttx nuttx.spk;
+ $(Q)([ $$? -eq 0 ] && echo "Done.")
endef
+
endif
diff --git a/tools/cxd56/Makefile b/tools/cxd56/Makefile.host
similarity index 98%
rename from tools/cxd56/Makefile
rename to tools/cxd56/Makefile.host
index 8511987..8925481 100644
--- a/tools/cxd56/Makefile
+++ b/tools/cxd56/Makefile.host
@@ -1,5 +1,5 @@
############################################################################
-# tools/mkspk/Makefile
+# tools/cxd56/Makefile.host
#
# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gn...@nuttx.org>
[incubator-nuttx] 06/08: CI: Store artifacts durring build
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a commit to branch releases/10.0
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit d750dbfda7c61ea0c799e39adfbde7657c558d10
Author: Brennan Ashton <ba...@brennanashton.com>
AuthorDate: Sun Oct 25 21:18:43 2020 -0700
CI: Store artifacts durring build
Add new option -A is added to tools/testbuild.sh that will take the
created build executable and store it in a folder for the config
that generated it under $ARTIFACTDIR which can be set via an
environment variable or defaulted to $(TOPDIR)/buildartifacts
This is also helpful for local testing because you can now run
tools/testbuild.sh -A sim.dat and have all of the simulation
targets generated without having to rebuild along the way.
In the GitHub Actions workflow the artifacs are uploaded
two two bundles one for macOS and one for Linux
Signed-off-by: Brennan Ashton <ba...@brennanashton.com>
---
.github/workflows/build.yml | 14 ++++++++++++--
boards/xtensa/esp32/esp32-core/scripts/Config.mk | 1 +
tools/Makefile.unix | 6 ++++++
tools/Makefile.win | 5 +++++
tools/cxd56/Config.mk | 2 +-
tools/testbuild.sh | 15 ++++++++++++++-
6 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9fa7f75..1760ec0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -161,8 +161,13 @@ jobs:
export CCACHE_DIR=`pwd`/ccache
mkdir $CCACHE_DIR
cd sources/testing
- ./cibuild.sh -c testlist/${{matrix.boards}}.dat
+ export ARTIFACTDIR=`pwd`/../../buildartifacts
+ ./cibuild.sh -A -c testlist/${{matrix.boards}}.dat
ccache -s
+ - uses: actions/upload-artifact@v2
+ with:
+ name: linux-builds
+ path: buildartifacts/
macOS:
runs-on: macos-10.15
@@ -195,5 +200,10 @@ jobs:
export CCACHE_DIR=`pwd`/ccache
mkdir $CCACHE_DIR
cd sources/testing
- ./cibuild.sh -i -c testlist/${{matrix.boards}}.dat
+ export ARTIFACTDIR=`pwd`/../../buildartifacts
+ ./cibuild.sh -i -A -c testlist/${{matrix.boards}}.dat
ccache -s
+ - uses: actions/upload-artifact@v2
+ with:
+ name: macos-builds
+ path: buildartifacts/
diff --git a/boards/xtensa/esp32/esp32-core/scripts/Config.mk b/boards/xtensa/esp32/esp32-core/scripts/Config.mk
index 0bedc52..a05af94 100644
--- a/boards/xtensa/esp32/esp32-core/scripts/Config.mk
+++ b/boards/xtensa/esp32/esp32-core/scripts/Config.mk
@@ -56,6 +56,7 @@ define POSTBUILD
dd if=$(PARTITION_TABLE) bs=1 seek=$(shell printf "%d" 0x8000) of=flash_image.bin conv=notrunc && \
dd if=$(NUTTXNAME).bin bs=1 seek=$(shell printf "%d" 0x10000) of=flash_image.bin conv=notrunc && \
echo "Generated: flash_image.bin (it can be run with 'qemu-system-xtensa -nographic -machine esp32 -drive file=flash_image.bin,if=mtd,format=raw')"; \
+ echo "flash_image.bin" >> $(NUTTXNAME).manifest; \
fi
endef
endif
diff --git a/tools/Makefile.unix b/tools/Makefile.unix
index cdde943..1d2bb15 100644
--- a/tools/Makefile.unix
+++ b/tools/Makefile.unix
@@ -416,17 +416,22 @@ endif
$(Q) if [ -w /tftpboot ] ; then \
cp -f $(BIN) /tftpboot/$(BIN).${CONFIG_ARCH}; \
fi
+ echo $(BIN) > $(NUTTXNAME).manifest
+ printf "%s\n" *.map >> $(NUTTXNAME).manifest
ifeq ($(CONFIG_INTELHEX_BINARY),y)
@echo "CP: $(NUTTXNAME).hex"
$(Q) $(OBJCOPY) $(OBJCOPYARGS) -O ihex $(BIN) $(NUTTXNAME).hex
+ echo $(NUTTXNAME).hex >> $(NUTTXNAME).manifest
endif
ifeq ($(CONFIG_MOTOROLA_SREC),y)
@echo "CP: $(NUTTXNAME).srec"
$(Q) $(OBJCOPY) $(OBJCOPYARGS) -O srec $(BIN) $(NUTTXNAME).srec
+ echo $(NUTTXNAME).srec >> $(NUTTXNAME).manifest
endif
ifeq ($(CONFIG_RAW_BINARY),y)
@echo "CP: $(NUTTXNAME).bin"
$(Q) $(OBJCOPY) $(OBJCOPYARGS) -O binary $(BIN) $(NUTTXNAME).bin
+ echo $(NUTTXNAME).bin >> $(NUTTXNAME).manifest
endif
ifeq ($(CONFIG_UBOOT_UIMAGE),y)
@echo "MKIMAGE: uImage"
@@ -435,6 +440,7 @@ ifeq ($(CONFIG_UBOOT_UIMAGE),y)
$(Q) if [ -w /tftpboot ] ; then \
cp -f uImage /tftpboot/uImage; \
fi
+ echo "uImage" >> $(NUTTXNAME).manifest
endif
$(call POSTBUILD, $(TOPDIR))
diff --git a/tools/Makefile.win b/tools/Makefile.win
index df9d909..932e2c0 100644
--- a/tools/Makefile.win
+++ b/tools/Makefile.win
@@ -384,17 +384,22 @@ ifeq ($(CONFIG_BUILD_2PASS),y)
$(Q) $(MAKE) -C $(CONFIG_PASS1_BUILDIR) LINKLIBS="$(LINKLIBS)" USERLIBS="$(USERLIBS)" "$(CONFIG_PASS1_TARGET)"
endif
$(Q) $(MAKE) -C $(ARCH_SRC) EXTRA_OBJS="$(EXTRA_OBJS)" LINKLIBS="$(LINKLIBS)" EXTRAFLAGS="$(KDEFINE) $(EXTRAFLAGS)" $(BIN)
+ echo $(BIN) > $(NUTTXNAME).manifest
+ printf '%s\n' *.map >> $(NUTTXNAME).manifest
ifeq ($(CONFIG_INTELHEX_BINARY),y)
@echo "CP: $(NUTTXNAME).hex"
$(Q) $(OBJCOPY) $(OBJCOPYARGS) -O ihex $(BIN) $(NUTTXNAME).hex
+ echo $(NUTTXNAME).hex >> $(NUTTXNAME).manifest
endif
ifeq ($(CONFIG_MOTOROLA_SREC),y)
@echo "CP: $(NUTTXNAME).srec"
$(Q) $(OBJCOPY) $(OBJCOPYARGS) -O srec $(BIN) $(NUTTXNAME).srec
+ echo $(NUTTXNAME).srec >> $(NUTTXNAME).manifest
endif
ifeq ($(CONFIG_RAW_BINARY),y)
@echo "CP: $(NUTTXNAME).bin"
$(Q) $(OBJCOPY) $(OBJCOPYARGS) -O binary $(BIN) $(NUTTXNAME).bin
+ echo $(NUTTXNAME).bin >> $(NUTTXNAME).manifest
endif
$(call POSTBUILD, $(TOPDIR))
diff --git a/tools/cxd56/Config.mk b/tools/cxd56/Config.mk
index a6456a8..570a4fe 100644
--- a/tools/cxd56/Config.mk
+++ b/tools/cxd56/Config.mk
@@ -32,7 +32,7 @@ define POSTBUILD
+$(Q) $(MAKE) -C $(TOPDIR)$(DELIM)tools$(DELIM)cxd56 -f Makefile.host
tools$(DELIM)cxd56$(DELIM)mkspk$(HOSTEXEEXT) -c2 nuttx nuttx nuttx.spk;
- $(Q)([ $$? -eq 0 ] && echo "Done.")
+ $(Q)([ $$? -eq 0 ] && echo nuttx.spk >> $(NUTTXNAME).manifest && echo "Done.")
endef
endif
diff --git a/tools/testbuild.sh b/tools/testbuild.sh
index b974e98..9876111 100755
--- a/tools/testbuild.sh
+++ b/tools/testbuild.sh
@@ -38,6 +38,9 @@ nuttx=$WD/../nuttx
progname=$0
fail=0
APPSDIR=$WD/../apps
+if [ -z $ARTIFACTDIR ]; then
+ ARTIFACTDIR=$WD/../buildartifacts
+fi
MAKE_FLAGS=-k
EXTRA_FLAGS="EXTRAFLAGS="
MAKE=make
@@ -46,6 +49,7 @@ unset HOPTION
unset JOPTION
PRINTLISTONLY=0
GITCLEAN=0
+SAVEARTIFACTS=0
case $(uname -s) in
Darwin*)
@@ -77,8 +81,9 @@ function showusage {
echo " -x exit on build failures"
echo " -j <ncpus> passed on to make. Default: No -j make option."
echo " -a <appsdir> provides the relative path to the apps/ directory. Default ../apps"
- echo " -t <topdir> provides the absolute path to top nuttx/ directory. Default $PWD/../nuttx"
+ echo " -t <topdir> provides the absolute path to top nuttx/ directory. Default ../nuttx"
echo " -p only print the list of configs without running any builds"
+ echo " -A store the build executable artifact in ARTIFACTDIR (defaults to ../buildartifacts"
echo " -G Use \"git clean -xfdq\" instead of \"make distclean\" to clean the tree."
echo " This option may speed up the builds. However, note that:"
echo " * This assumes that your trees are git based."
@@ -130,6 +135,9 @@ while [ ! -z "$1" ]; do
-G )
GITCLEAN=1
;;
+ -A )
+ SAVEARTIFACTS=1
+ ;;
-h )
showusage
;;
@@ -247,6 +255,11 @@ function configure {
function build {
echo " Building NuttX..."
makefunc
+ if [ ${SAVEARTIFACTS} -eq 1 ]; then
+ artifactconfigdir=$ARTIFACTDIR/$(echo $config | sed "s/:/\//")/
+ mkdir -p $artifactconfigdir
+ xargs -a $nuttx/nuttx.manifest cp -t $artifactconfigdir
+ fi
# Ensure defconfig in the canonical form
[incubator-nuttx] 04/08: build.yml: Switch
avr-mips-riscv-x86-xtensa.dat to other.dat
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a commit to branch releases/10.0
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 730037b660ee8f1b0128541372ec17dc31338957
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Wed Oct 28 18:28:08 2020 +0800
build.yml: Switch avr-mips-riscv-x86-xtensa.dat to other.dat
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 1968eb7..9fa7f75 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -124,7 +124,7 @@ jobs:
strategy:
matrix:
- boards: [arm-01, arm-02, arm-03, arm-04, arm-05, arm-06, arm-07, arm-08, arm-09, arm-10, arm-11, arm-12, arm-13, avr-mips-riscv-x86-xtensa, sim, renesas]
+ boards: [arm-01, arm-02, arm-03, arm-04, arm-05, arm-06, arm-07, arm-08, arm-09, arm-10, arm-11, arm-12, arm-13, other, sim]
steps:
- name: Download Source Artifact
@@ -169,7 +169,7 @@ jobs:
needs: Fetch-Source
strategy:
matrix:
- boards: [arm-12, avr-mips-riscv-x86-xtensa, sim]
+ boards: [arm-12, other, sim]
steps:
- name: Download Source Artifact
uses: actions/download-artifact@v1
[incubator-nuttx] 02/08: tools/testbuild.sh: Don't support to
change size_t type in datlist
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a commit to branch releases/10.0
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 6482d4f6202a9af4d7a188d11b364886bdfa3273
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Tue Oct 27 01:10:40 2020 +0800
tools/testbuild.sh: Don't support to change size_t type in datlist
since it doesn't need anymore with the follow patch:
commit e7d92600147c1bb1e5160360fde33e744e385544
Author: Xiang Xiao <xi...@xiaomi.com>
Date: Mon Feb 17 20:19:25 2020 +0800
arch: Customize the typedef of size_t instead of intptr_t
To ensure size_t same as toolchain definition in the first place and
rename CXX_NEWLONG to ARCH_SIZET_LONG. The change also check whether
__SIZE_TYPE__ exist before CONFIG_ARCH_SIZET_LONG so our definition
can align with toolchain(gcc/clang) definition automatically.
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
TODO | 21 ++-------------------
tools/README.txt | 4 ++--
tools/testbuild.sh | 15 ---------------
3 files changed, 4 insertions(+), 36 deletions(-)
diff --git a/TODO b/TODO
index e03e408..7c839e6 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-NuttX TODO List (Last updated July 19, 2020)
+NuttX TODO List (Last updated October 20, 2020)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
This file summarizes known NuttX bugs, limitations, inconsistencies with
@@ -18,7 +18,7 @@ nuttx/:
(0) Message Queues (sched/mqueue)
(1) Work Queues (sched/wqueue)
(6) Kernel/Protected Build
- (3) C++ Support
+ (2) C++ Support
(5) Binary loaders (binfmt/)
(17) Network (net/, drivers/net)
(4) USB (drivers/usbdev, drivers/usbhost)
@@ -1077,23 +1077,6 @@ o Kernel/Protected Build
o C++ Support
^^^^^^^^^^^
- Title: USE OF SIZE_T IN NEW OPERATOR
- Description: The argument of the 'new' operators should take a type of
- size_t (see libxx/libxx_new.cxx and libxx/libxx_newa.cxx). But
- size_t has an unknown underlying. In the nuttx sys/types.h
- header file, size_t is typed as uint32_t (which is determined by
- architecture-specific logic). But the C++ compiler may believe
- that size_t is of a different type resulting in compilation errors
- in the operator. Using the underlying integer type Instead of
- size_t seems to resolve the compilation issues.
- Status: Kind of open. There is a workaround. Setting CONFIG_ARCH_SIZET_LONG
- =y will define the operators with argument of type unsigned long;
- Setting CONFIG_ARCH_SIZET_LONG=n will define the operators with
- argument of type unsigned int. But this is pretty ugly! A better
- solution would be to get a hold of the compilers definition of
- size_t.
- Priority: Low.
-
Title: STATIC CONSTRUCTORS AND MULTITASKING
Description: The logic that calls static constructors operates on the main
thread of the initial user application task. Any static
diff --git a/tools/README.txt b/tools/README.txt
index f92924a..7282d0d 100644
--- a/tools/README.txt
+++ b/tools/README.txt
@@ -1026,9 +1026,9 @@ testbuild.sh
build descriptions consists of two comma separated values. For example:
stm32f429i-disco:nsh,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
- arduino-due:nsh,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL,-CONFIG_ARCH_SIZET_LONG
+ arduino-due:nsh,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
/arm,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
- /risc-v,CONFIG_RV32IM_TOOLCHAIN_GNU_RVGL,CONFIG_ARCH_SIZET_LONG
+ /risc-v,CONFIG_RV32IM_TOOLCHAIN_GNU_RVGL
The first value is the usual configuration description of the form
<board-name>:<configuration-name> or /<folder-name> and must correspond to a
diff --git a/tools/testbuild.sh b/tools/testbuild.sh
index 2c4a479..afc27bc 100755
--- a/tools/testbuild.sh
+++ b/tools/testbuild.sh
@@ -219,14 +219,6 @@ function configure {
sed -i -e "/$toolchain/d" $nuttx/.config
echo "$toolchain=y" >> $nuttx/.config
- if [ "X$sizet" == "Xuint" ]; then
- echo " Disabling CONFIG_ARCH_SIZET_LONG"
- sed -i -e "/CONFIG_ARCH_SIZET_LONG/d" $nuttx/.config
- elif [ "X$sizet" == "Xulong" ]; then
- echo " Enabling CONFIG_ARCH_SIZET_LONG"
- sed -i -e "\$aCONFIG_ARCH_SIZET_LONG=y" $nuttx/.config
- fi
-
makefunc olddefconfig
fi
@@ -297,18 +289,11 @@ function dotest {
fi
unset toolchain
- unset sizet
if [ "X$config" != "X$1" ]; then
toolchain=`echo $1 | cut -d',' -f2`
if [ -z "$toolchain" ]; then
echo " Warning: no tool configuration"
fi
- archsizet=`echo $line | cut -d',' -f3`
- if [ "X$archsizet" == "XCONFIG_ARCH_SIZET_LONG" ]; then
- sizet=ulong
- elif [ "X$archsizet" == "X-CONFIG_ARCH_SIZET_LONG" ]; then
- sizet=uint
- fi
fi
# Perform the build test
[incubator-nuttx] 08/08: RX65N ipv6 defconfig modified
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a commit to branch releases/10.0
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit aed24afeb01b248a3719acf354ee65de470fa68c
Author: Bhindhiya <bi...@gmail.com>
AuthorDate: Fri Oct 23 16:43:07 2020 +0530
RX65N ipv6 defconfig modified
---
.../rx65n/rx65n-grrose/configs/ipv6/defconfig | 123 +++++++--------------
.../rx65n/rx65n-rsk2mb/configs/ipv6/defconfig | 108 +++++++-----------
2 files changed, 78 insertions(+), 153 deletions(-)
diff --git a/boards/renesas/rx65n/rx65n-grrose/configs/ipv6/defconfig b/boards/renesas/rx65n/rx65n-grrose/configs/ipv6/defconfig
index 9a52ede..abf847b 100644
--- a/boards/renesas/rx65n/rx65n-grrose/configs/ipv6/defconfig
+++ b/boards/renesas/rx65n/rx65n-grrose/configs/ipv6/defconfig
@@ -1,74 +1,62 @@
-CONFIG_ARCH_BOARD_RX65N_GRROSE=y
+#
+# This file is autogenerated: PLEASE DO NOT EDIT IT.
+#
+# You can use "make menuconfig" to make any modifications to the installed .config file.
+# You can then do "make savedefconfig" to generate a new defconfig file that includes your
+# modifications.
+#
+# CONFIG_NET_IPv4 is not set
+CONFIG_ARCH="renesas"
CONFIG_ARCH_BOARD="rx65n-grrose"
+CONFIG_ARCH_BOARD_RX65N_GRROSE=y
+CONFIG_ARCH_CHIP="rx65n"
CONFIG_ARCH_CHIP_R5F565NEHDFP=y
+CONFIG_ARCH_INTERRUPTSTACK=1024
CONFIG_ARCH_RENESAS=y
CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH="renesas"
-CONFIG_ARCH_CHIP="rx65n"
CONFIG_BOARD_LOOPSPERMSEC=15001
-CONFIG_MOTOROLA_SREC=y
-CONFIG_ENDIAN_LITTLE=y
-CONFIG_SYSTEM_NSH=y
-CONFIG_MAX_TASKS=8
-CONFIG_DEBUG_FEATURES=y
-CONFIG_ARCH_INTERRUPTSTACK=1024
CONFIG_BUILTIN=y
-CONFIG_ETH0_PHY_LAN8720A=y
+CONFIG_DEBUG_FEATURES=y
+CONFIG_DEBUG_NET=y
+CONFIG_EXAMPLES_SERIALBLASTER=y
+CONFIG_EXAMPLES_SERIALRX=y
+CONFIG_EXAMPLES_SERIALRX_PRINTSTR=y
+CONFIG_EXAMPLES_SERIALRX_PRIORITY=75
+CONFIG_FS_PROCFS=y
+CONFIG_FS_PROCFS_REGISTER=y
+CONFIG_MAX_TASKS=8
+CONFIG_MOTOROLA_SREC=y
CONFIG_NET=y
-#CONFIG_NETDB_DNSCLIENT=y
-#CONFIG_NETDB_DNSSERVER_NOADDR=y
CONFIG_NETDEV_PHY_IOCTL=y
CONFIG_NETDEV_STATISTICS=y
-#CONFIG_NETUTILS_TFTPC=y
-#CONFIG_NETUTILS_WEBCLIENT=y
-#CONFIG_NET_ARP_SEND=y
+CONFIG_NETINIT_IPv6NETMASK_8=0xff80
+CONFIG_NETINIT_THREAD=y
CONFIG_NET_BROADCAST=y
-#CONFIG_NET_ICMP=y
-#CONFIG_NET_ICMP_SOCKET=y
+CONFIG_NET_ICMPv6=y
+CONFIG_NET_ICMPv6_NEIGHBOR=y
+CONFIG_NET_ICMPv6_SOCKET=y
+CONFIG_NET_IPv6=y
+CONFIG_NET_MLD=y
CONFIG_NET_SOCKOPTS=y
+CONFIG_NET_SOLINGER=y
CONFIG_NET_STATISTICS=y
CONFIG_NET_TCP=y
CONFIG_NET_TCPBACKLOG=y
CONFIG_NET_TCP_WRITE_BUFFERS=y
CONFIG_NET_UDP=y
-CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NFILE_DESCRIPTORS=8
+CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512
CONFIG_NSH_LINELEN=64
CONFIG_NSH_READLINE=y
-CONFIG_NETINIT_MONITOR=y
-CONFIG_NETINIT_THREAD=y
-
-CONFIG_NETINIT_RETRYMSEC=2000
-CONFIG_NETINIT_SIGNO=18
-
CONFIG_NUNGET_CHARS=0
CONFIG_PREALLOC_TIMERS=0
CONFIG_PTHREAD_STACK_DEFAULT=1024
CONFIG_RAM_SIZE=655360
CONFIG_RAM_START=0x00000000
CONFIG_RAW_BINARY=y
-CONFIG_RX65N_SCI0=y
-CONFIG_RX65N_SCI1=y
-CONFIG_RX65N_SCI2=y
-CONFIG_RX65N_SCI5=y
-CONFIG_RX65N_SCI6=y
-CONFIG_RX65N_SCI8=y
-CONFIG_SCI0_SERIALDRIVER=y
-CONFIG_SCI0_BAUD=115200
-CONFIG_SCI1_SERIAL_CONSOLE=y
-CONFIG_SCI1_SERIALDRIVER=y
-CONFIG_SCI1_BAUD=115200
-CONFIG_SCI2_SERIALDRIVER=y
-CONFIG_SCI2_BAUD=115200
-CONFIG_SCI5_SERIALDRIVER=y
-CONFIG_SCI5_BAUD=921600
-CONFIG_SCI6_SERIALDRIVER=y
-CONFIG_SCI6_BAUD=115200
-CONFIG_SCI8_SERIALDRIVER=y
-CONFIG_SCI8_BAUD=115200
-CONFIG_RX65N_EMAC=y
CONFIG_RX65N_EMAC0=y
+CONFIG_RX65N_EMAC0_PHYADDR=0
CONFIG_RX65N_EMAC0_PHYSR=30
CONFIG_RX65N_EMAC0_PHYSR_100FD=0x18
CONFIG_RX65N_EMAC0_PHYSR_100HD=0x08
@@ -77,49 +65,16 @@ CONFIG_RX65N_EMAC0_PHYSR_10HD=0x04
CONFIG_RX65N_EMAC0_PHYSR_ALTCONFIG=y
CONFIG_RX65N_EMAC0_PHYSR_ALTMODE=0x1c
CONFIG_RX65N_EMAC0_RMII=y
-CONFIG_RX65N_EMAC0_PHYADDR=0
-CONFIG_SCHED_WORKQUEUE=y
+CONFIG_RX65N_SCI0=y
CONFIG_SCHED_HPWORK=y
CONFIG_SCHED_LPWORK=y
+CONFIG_SCI1_SERIAL_CONSOLE=y
+CONFIG_SCI5_BAUD=921600
CONFIG_SDCLONE_DISABLE=y
-#CONFIG_SYSTEM_PING=y
-CONFIG_ICU=y
CONFIG_STDIO_DISABLE_BUFFERING=y
-CONFIG_TASK_NAME_SIZE=0
-CONFIG_USER_ENTRYPOINT="nsh_main"
-CONFIG_USERMAIN_STACKSIZE=1024
-CONFIG_IDLETHREAD_STACKSIZE=1024
-CONFIG_FS_PROCFS=y
-CONFIG_FS_PROCFS_REGISTER=y
-CONFIG_NET_ETH_PKTSIZE = 590
-CONFIG_RX65N_CMTW0=y
-CONFIG_RX65N_PERIB=y
-CONFIG_NETUTILS_DHCPC=y
-CONFIG_NETUTILS_DHCPD=y
-CONFIG_NSH_DHCPC=y
-CONFIG_NETINIT_DHCPC=y
-CONFIG_SYSTEM_DHCPC_RENEW=y
+CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_NSH_PRIORITY=50
-CONFIG_EXAMPLES_SERIALBLASTER=y
-CONFIG_EXAMPLES_SERIALBLASTER_STACKSIZE=2048
-CONFIG_EXAMPLES_SERIALBLASTER_PRIORITY=50
-CONFIG_EXAMPLES_SERIALBLASTER_DEVPATH="/dev/ttyS2"
-CONFIG_EXAMPLES_SERIALRX=y
-CONFIG_EXAMPLES_SERIALRX_STACKSIZE=2048
-CONFIG_EXAMPLES_SERIALRX_PRIORITY=75
-CONFIG_EXAMPLES_SERIALRX_BUFSIZE=11520
-CONFIG_EXAMPLES_SERIALRX_DEVPATH="/dev/ttyS0"
-CONFIG_EXAMPLES_SERIALRX_PRINTSTR=y
-CONFIG_DEBUG_NET=y
-
-# CONFIG_NET_IPv4 is not set
-CONFIG_NETINIT_IPv6NETMASK_8=0xff80
-CONFIG_NET_ICMPv6=y
-CONFIG_NET_ICMPv6_NEIGHBOR=y
-CONFIG_NET_ICMPv6_SOCKET=y
-CONFIG_NET_IPv6=y
CONFIG_SYSTEM_PING6=y
-CONFIG_NET_MLD=y
-#CONFIG_NET_MCASTGROUP=y
-CONFIG_NET_SOLINGER=y
-
+CONFIG_TASK_NAME_SIZE=0
+CONFIG_USERMAIN_STACKSIZE=1024
+CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/renesas/rx65n/rx65n-rsk2mb/configs/ipv6/defconfig b/boards/renesas/rx65n/rx65n-rsk2mb/configs/ipv6/defconfig
index 7ddfa69..f318501 100644
--- a/boards/renesas/rx65n/rx65n-rsk2mb/configs/ipv6/defconfig
+++ b/boards/renesas/rx65n/rx65n-rsk2mb/configs/ipv6/defconfig
@@ -1,60 +1,62 @@
+#
+# This file is autogenerated: PLEASE DO NOT EDIT IT.
+#
+# You can use "make menuconfig" to make any modifications to the installed .config file.
+# You can then do "make savedefconfig" to generate a new defconfig file that includes your
+# modifications.
+#
+# CONFIG_NET_IPv4 is not set
+CONFIG_ARCH="renesas"
+CONFIG_ARCH_BOARD="rx65n-rsk2mb"
CONFIG_ARCH_BOARD_RX65N_RSK2MB=y
-CONFIG_ARCH_BOARD="rx65n"
+CONFIG_ARCH_CHIP="rx65n"
CONFIG_ARCH_CHIP_R5F565NEHDFC=y
+CONFIG_ARCH_INTERRUPTSTACK=1024
CONFIG_ARCH_RENESAS=y
CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH="renesas"
-CONFIG_ARCH_CHIP="rx65n"
CONFIG_BOARD_LOOPSPERMSEC=15001
-CONFIG_MOTOROLA_SREC=y
-CONFIG_ENDIAN_LITTLE=y
-CONFIG_SYSTEM_NSH=y
-CONFIG_MAX_TASKS=8
-CONFIG_DEBUG_FEATURES=y
-CONFIG_ARCH_INTERRUPTSTACK=1024
CONFIG_BUILTIN=y
-CONFIG_ETH0_PHY_DP83620=y
+CONFIG_DEBUG_FEATURES=y
+CONFIG_DEBUG_NET=y
+CONFIG_EXAMPLES_SERIALBLASTER=y
+CONFIG_EXAMPLES_SERIALRX=y
+CONFIG_EXAMPLES_SERIALRX_PRINTSTR=y
+CONFIG_EXAMPLES_SERIALRX_PRIORITY=75
+CONFIG_FS_PROCFS=y
+CONFIG_FS_PROCFS_REGISTER=y
+CONFIG_MAX_TASKS=8
+CONFIG_MOTOROLA_SREC=y
CONFIG_NET=y
-#CONFIG_NETDB_DNSCLIENT=y
-#CONFIG_NETDB_DNSSERVER_NOADDR=y
CONFIG_NETDEV_PHY_IOCTL=y
CONFIG_NETDEV_STATISTICS=y
-#CONFIG_NETUTILS_TFTPC=y
-#CONFIG_NETUTILS_WEBCLIENT=y
-#CONFIG_NET_ARP_SEND=y
+CONFIG_NETINIT_IPv6NETMASK_8=0xff80
+CONFIG_NETINIT_THREAD=y
CONFIG_NET_BROADCAST=y
-#CONFIG_NET_ICMP=y
-#CONFIG_NET_ICMP_SOCKET=y
+CONFIG_NET_ICMPv6=y
+CONFIG_NET_ICMPv6_NEIGHBOR=y
+CONFIG_NET_ICMPv6_SOCKET=y
+CONFIG_NET_IPv6=y
+CONFIG_NET_MLD=y
CONFIG_NET_SOCKOPTS=y
+CONFIG_NET_SOLINGER=y
CONFIG_NET_STATISTICS=y
CONFIG_NET_TCP=y
CONFIG_NET_TCPBACKLOG=y
CONFIG_NET_TCP_WRITE_BUFFERS=y
CONFIG_NET_UDP=y
-CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NFILE_DESCRIPTORS=8
+CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512
CONFIG_NSH_LINELEN=64
CONFIG_NSH_READLINE=y
-CONFIG_NETINIT_MONITOR=y
-CONFIG_NETINIT_THREAD=y
-
-CONFIG_NETINIT_RETRYMSEC=2000
-CONFIG_NETINIT_SIGNO=18
-
CONFIG_NUNGET_CHARS=0
CONFIG_PREALLOC_TIMERS=0
CONFIG_PTHREAD_STACK_DEFAULT=1024
CONFIG_RAM_SIZE=262144
CONFIG_RAM_START=0x00000000
CONFIG_RAW_BINARY=y
-CONFIG_SCI2_SERIALDRIVER=y
-CONFIG_RX65N_SCI2=y
-CONFIG_SCI8_SERIALDRIVER=y
-CONFIG_SCI8_SERIAL_CONSOLE=y
-CONFIG_RX65N_SCI8=y
-CONFIG_RX65N_EMAC=y
CONFIG_RX65N_EMAC0=y
+CONFIG_RX65N_EMAC0_PHYADDR=30
CONFIG_RX65N_EMAC0_PHYSR=30
CONFIG_RX65N_EMAC0_PHYSR_100FD=0x4
CONFIG_RX65N_EMAC0_PHYSR_100HD=0x0
@@ -62,48 +64,16 @@ CONFIG_RX65N_EMAC0_PHYSR_10FD=0x6
CONFIG_RX65N_EMAC0_PHYSR_10HD=0x2
CONFIG_RX65N_EMAC0_PHYSR_ALTCONFIG=y
CONFIG_RX65N_EMAC0_PHYSR_ALTMODE=0x6
-CONFIG_RX65N_EMAC0_MII=y
-CONFIG_RX65N_EMAC0_PHYADDR=30
-CONFIG_SCHED_WORKQUEUE=y
+CONFIG_RX65N_SCI2=y
+CONFIG_RX65N_SCI8=y
CONFIG_SCHED_HPWORK=y
CONFIG_SCHED_LPWORK=y
+CONFIG_SCI8_SERIAL_CONSOLE=y
CONFIG_SDCLONE_DISABLE=y
-#CONFIG_SYSTEM_PING=y
-CONFIG_ICU=y
CONFIG_STDIO_DISABLE_BUFFERING=y
-CONFIG_TASK_NAME_SIZE=0
-CONFIG_USER_ENTRYPOINT="nsh_main"
-CONFIG_USERMAIN_STACKSIZE=1024
-CONFIG_FS_PROCFS=y
-CONFIG_FS_PROCFS_REGISTER=y
-CONFIG_NET_ETH_PKTSIZE = 590
-CONFIG_RX65N_CMTW0=y
-CONFIG_RX65N_PERIB=y
-CONFIG_NETUTILS_DHCPC=y
-CONFIG_NETUTILS_DHCPD=y
-CONFIG_NSH_DHCPC=y
-CONFIG_NETINIT_DHCPC=y
+CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_NSH_PRIORITY=50
-CONFIG_EXAMPLES_SERIALBLASTER=y
-CONFIG_EXAMPLES_SERIALBLASTER_STACKSIZE=2048
-CONFIG_EXAMPLES_SERIALBLASTER_PRIORITY=50
-CONFIG_EXAMPLES_SERIALBLASTER_DEVPATH="/dev/ttyS2"
-CONFIG_EXAMPLES_SERIALRX=y
-CONFIG_EXAMPLES_SERIALRX_STACKSIZE=2048
-CONFIG_EXAMPLES_SERIALRX_PRIORITY=75
-CONFIG_EXAMPLES_SERIALRX_BUFSIZE=11520
-CONFIG_EXAMPLES_SERIALRX_DEVPATH="/dev/ttyS0"
-CONFIG_EXAMPLES_SERIALRX_PRINTSTR=y
-CONFIG_DEBUG_NET=y
-
-# CONFIG_NET_IPv4 is not set
-CONFIG_NETINIT_IPv6NETMASK_8=0xff80
-CONFIG_NET_ICMPv6=y
-CONFIG_NET_ICMPv6_NEIGHBOR=y
-CONFIG_NET_ICMPv6_SOCKET=y
-CONFIG_NET_IPv6=y
CONFIG_SYSTEM_PING6=y
-CONFIG_NET_MLD=y
-#CONFIG_NET_MCASTGROUP=y
-CONFIG_NET_SOLINGER=y
-
+CONFIG_TASK_NAME_SIZE=0
+CONFIG_USERMAIN_STACKSIZE=1024
+CONFIG_USER_ENTRYPOINT="nsh_main"
[incubator-nuttx] 07/08: build: Fix testbuild.sh artifact copy on
macOS
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a commit to branch releases/10.0
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 68ed44cccfbd26bda6ec1403a84ed432fa258988
Author: Brennan Ashton <ba...@brennanashton.com>
AuthorDate: Wed Oct 28 20:06:40 2020 -0700
build: Fix testbuild.sh artifact copy on macOS
xargs for macOS does not support the '-a/--file-arg' flag so
build artifacts were not getting stored. This change passes it in
via stdin which is more portable.
Signed-off-by: Brennan Ashton <ba...@brennanashton.com>
---
tools/testbuild.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/testbuild.sh b/tools/testbuild.sh
index 9876111..6c3d8d8 100755
--- a/tools/testbuild.sh
+++ b/tools/testbuild.sh
@@ -258,7 +258,7 @@ function build {
if [ ${SAVEARTIFACTS} -eq 1 ]; then
artifactconfigdir=$ARTIFACTDIR/$(echo $config | sed "s/:/\//")/
mkdir -p $artifactconfigdir
- xargs -a $nuttx/nuttx.manifest cp -t $artifactconfigdir
+ xargs -I "{}" cp "{}" $artifactconfigdir < $nuttx/nuttx.manifest
fi
# Ensure defconfig in the canonical form
[incubator-nuttx] 01/08: tools: Remove the special handle for
Ubuntu under Windows 10
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a commit to branch releases/10.0
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit cb314a44f3f5a560d0343a1052f84e269930dab3
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun Oct 18 21:28:35 2020 +0800
tools: Remove the special handle for Ubuntu under Windows 10
since the Native Linux support could be reused for this case:
https://lists.apache.org/thread.html/r315682ed20bbeb2f1403cf592f892ef009274423189ffc5b3841a6a9%40%3Cdev.nuttx.apache.org%3E
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
Documentation/quickstart/configuring.rst | 1 -
Kconfig | 6 ------
arch/mips/src/mips32/Kconfig | 2 +-
boards/arm/stm32l4/b-l475e-iot01a/README.txt | 6 +++---
tools/Config.mk | 2 --
tools/README.txt | 15 +++++++--------
tools/configure.bat | 7 +++----
tools/configure.c | 26 +++-----------------------
tools/configure.sh | 5 ++---
tools/sethost.sh | 20 +++++---------------
tools/testbuild.sh | 8 ++++----
11 files changed, 28 insertions(+), 70 deletions(-)
diff --git a/Documentation/quickstart/configuring.rst b/Documentation/quickstart/configuring.rst
index c70c536..a289969 100644
--- a/Documentation/quickstart/configuring.rst
+++ b/Documentation/quickstart/configuring.rst
@@ -32,7 +32,6 @@ has your configuration options selected.
-l selects the Linux (l) host environment.
-m selects the macOS (m) host environment.
-c selects the Windows host and Cygwin (c) environment.
- -u selects the Windows host and Ubuntu under Windows 10 (u) environment.
-g selects the Windows host and MinGW/MSYS environment.
-n selects the Windows host and Windows native (n) environment.
diff --git a/Kconfig b/Kconfig
index 331e3bd..c696362 100644
--- a/Kconfig
+++ b/Kconfig
@@ -93,12 +93,6 @@ config WINDOWS_CYGWIN
Build natively in a Cygwin environment with POSIX style paths (like
/cygdrive/c/Program Files)
-config WINDOWS_UBUNTU
- bool "Ubuntu under Windows 10"
- ---help---
- Build natively in an Ubuntu shell under Windows 10 environment with
- POSIX style paths (like /mnt/c/Program Files)
-
config WINDOWS_MSYS
bool "MSYS or MSYS2"
select TOOLCHAIN_WINDOWS
diff --git a/arch/mips/src/mips32/Kconfig b/arch/mips/src/mips32/Kconfig
index bde51e3..9de7126 100644
--- a/arch/mips/src/mips32/Kconfig
+++ b/arch/mips/src/mips32/Kconfig
@@ -58,7 +58,7 @@ config MIPS32_TOOLCHAIN_MICROCHIPOPENL
config MIPS32_TOOLCHAIN_PINGUINOW
bool "Pinguino mips-elf toolchain under Windows"
- depends on TOOLCHAIN_WINDOWS || WINDOWS_UBUNTU
+ depends on TOOLCHAIN_WINDOWS
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
select ARCH_TOOLCHAIN_GNU
diff --git a/boards/arm/stm32l4/b-l475e-iot01a/README.txt b/boards/arm/stm32l4/b-l475e-iot01a/README.txt
index ae80ad4..0d147f4 100644
--- a/boards/arm/stm32l4/b-l475e-iot01a/README.txt
+++ b/boards/arm/stm32l4/b-l475e-iot01a/README.txt
@@ -190,14 +190,14 @@ Configurations
Each B-L475E-IOT01A configuration is maintained in a sub-directory and
can be selected as follow:
- tools/configure.sh [-l|c|u|n] /b-l475e-iot01a:<subdir>
+ tools/configure.sh [-l|c|n] /b-l475e-iot01a:<subdir>
Where:
-l selects the Linux (l) host environment. The [-c|u|n] options
select one of the Windows environments. Default: Use host setup
in the defconfig file
- [-c|u|n] selects the Windows host and a Windows environment: Cygwin (c),
- Ubuntu under Windows 10 (u), or Windows native (n). Default Cygwin
+ [-c|n] selects the Windows host and a Windows environment:
+ Cygwin (c), or Windows native (n). Default Cygwin
Before building, make sure that:
diff --git a/tools/Config.mk b/tools/Config.mk
index 2edcf11..b6a36c2 100644
--- a/tools/Config.mk
+++ b/tools/Config.mk
@@ -114,10 +114,8 @@ ifeq ($(HOSTOS),Cygwin)
endif
ifeq ($(CONFIG_HOST_WINDOWS),y)
-ifneq ($(CONFIG_WINDOWS_UBUNTU),y)
HOSTEXEEXT ?= .exe
endif
-endif
# This define is passed as EXTRAFLAGS for kernel-mode builds. It is also passed
# during PASS1 (but not PASS2) context and depend targets.
diff --git a/tools/README.txt b/tools/README.txt
index e910567..f92924a 100644
--- a/tools/README.txt
+++ b/tools/README.txt
@@ -935,13 +935,12 @@ sethost.sh
$ ./sethost.sh -h
- USAGE: ./sethost.sh [-l|m|c|u|g|n] [make-opts]
+ USAGE: ./sethost.sh [-l|m|c|g|n] [make-opts]
./sethost.sh -h
Where:
- -l|m|c|u|g|n selects Linux (l), macOS (m), Cygwin (c),
- Ubuntu under Windows 10 (u), MSYS/MSYS2 (g)
- or Windows native (n). Default Linux
+ -l|m|c|g|n selects Linux (l), macOS (m), Cygwin (c),
+ MSYS/MSYS2 (g) or Windows native (n). Default Linux
make-opts directly pass to make
-h will show this help test and terminate
@@ -989,12 +988,12 @@ testbuild.sh
$ ./testbuild.sh -h
- USAGE: ./testbuild.sh [-l|m|c|u|g|n] [-d] [-x] [-j <ncpus>] [-a <appsdir>] [-t <topdir>] [-p] [-G] <testlist-file>
+ USAGE: ./testbuild.sh [-l|m|c|g|n] [-d] [-x] [-j <ncpus>] [-a <appsdir>] [-t <topdir>] [-p] [-G] <testlist-file>
./testbuild.sh -h
Where:
- -l|m|c|u|g|n selects Linux (l), macOS (m), Cygwin (c),
- Ubuntu under Windows 10 (u), MSYS/MSYS2 (g) or Windows native (n). Default Linux
+ -l|m|c|g|n selects Linux (l), macOS (m), Cygwin (c),
+ MSYS/MSYS2 (g) or Windows native (n). Default Linux
-d enables script debug output
-x exit on build failures
-j <ncpus> passed on to make. Default: No -j make option.
@@ -1018,7 +1017,7 @@ testbuild.sh
These script needs two pieces of information.
a. A description of the platform that you are testing on. This description
- is provided by the optional -l, -m, -c, -u, -g and -n options.
+ is provided by the optional -l, -m, -c, -g and -n options.
b. A list of configurations to build. That list is provided by a test
list file. The final, non-optional parameter, <testlist-file>,
provides the path to that file.
diff --git a/tools/configure.bat b/tools/configure.bat
index ac4dba6..f2e6edf 100755
--- a/tools/configure.bat
+++ b/tools/configure.bat
@@ -63,7 +63,6 @@ if "%1"=="-f" goto :SetFormat
if "%1"=="-b" goto :SetFormat
if "%1"=="-l" goto :SetHostOption
if "%1"=="-c" goto :SetHostOption
-if "%1"=="-u" goto :SetHostOption
if "%1"=="-n" goto :SetHostOption
if "%1"=="-L" goto :SetList
if "%1"=="-a" goto :SetAppDir
@@ -133,11 +132,11 @@ echo style paths are used by default.
echo -f:
echo Informs the tool that it should use POSIX style paths like /usr/local/bin.
echo By default, Windows style paths like C:\\Program Files are used.
-echo -l selects the Linux (l) host environment. The [-c^|u^|n] options
+echo -l selects the Linux (l) host environment. The [-c^|n] options
echo select one of the Windows environments. Default: Use host setup
echo in the defconfig file
-echo [-c^|u^|n] selects the Windows host and a Windows environment: Cygwin (c),
-echo Ubuntu under Windows 10 (u), or Windows native (n). Default Cygwin
+echo [-c^|n] selects the Windows host and a Windows environment:
+echo Cygwin (c), or Windows native (n). Default Cygwin
echo -L:
echo List all available configurations.
echo -a ^<app-dir^>:
diff --git a/tools/configure.c b/tools/configure.c
index cf10f84..f7618d8 100644
--- a/tools/configure.c
+++ b/tools/configure.c
@@ -70,8 +70,7 @@
#define WINDOWS_NATIVE 1
#define WINDOWS_CYGWIN 2
-#define WINDOWS_UBUNTU 3
-#define WINDOWS_MSYS 4
+#define WINDOWS_MSYS 3
/****************************************************************************
* Private Function Prototypes
@@ -182,7 +181,7 @@ static const char *g_optfiles[] =
static void show_usage(const char *progname, int exitcode)
{
- fprintf(stderr, "\nUSAGE: %s [-d] [-E] [-e] [-b|f] [-L] [-l|m|c|u|g|n] "
+ fprintf(stderr, "\nUSAGE: %s [-d] [-E] [-e] [-b|f] [-L] [-l|m|c|g|n] "
"[-a <app-dir>] <board-name>:<config-name> [make-opts]\n",
progname);
fprintf(stderr, "\nUSAGE: %s [-h]\n", progname);
@@ -215,12 +214,11 @@ static void show_usage(const char *progname, int exitcode)
fprintf(stderr, " style paths like C:\\Program Files are used.\n");
fprintf(stderr, " POSIX style paths are used by default.\n");
#endif
- fprintf(stderr, " [-l|m|c|u|g|n]\n");
+ fprintf(stderr, " [-l|m|c|g|n]\n");
fprintf(stderr, " Selects the host environment.\n");
fprintf(stderr, " -l Selects the Linux (l) host environment.\n");
fprintf(stderr, " -m Selects the macOS (m) host environment.\n");
fprintf(stderr, " -c Selects the Windows Cygwin (c) environment.\n");
- fprintf(stderr, " -u Selects the Windows Ubuntu (u) environment.\n");
fprintf(stderr, " -g Selects the Windows MinGW/MSYS environment.\n");
fprintf(stderr, " -n Selects the Windows native (n) environment.\n");
fprintf(stderr, " Default: Use host setup in the defconfig file.\n");
@@ -342,11 +340,6 @@ static void parse_args(int argc, char **argv)
g_windows = WINDOWS_NATIVE;
break;
- case 'u' :
- g_host = HOST_WINDOWS;
- g_windows = WINDOWS_UBUNTU;
- break;
-
case '?' :
fprintf(stderr, "ERROR: Unrecognized option: %c\n", optopt);
show_usage(argv[0], EXIT_FAILURE);
@@ -1353,7 +1346,6 @@ static void set_host(const char *destconfig)
disable_feature(destconfig, "CONFIG_WINDOWS_NATIVE");
disable_feature(destconfig, "CONFIG_WINDOWS_CYGWIN");
- disable_feature(destconfig, "CONFIG_WINDOWS_UBUNTU");
disable_feature(destconfig, "CONFIG_WINDOWS_MSYS");
disable_feature(destconfig, "CONFIG_WINDOWS_OTHER");
@@ -1372,7 +1364,6 @@ static void set_host(const char *destconfig)
disable_feature(destconfig, "CONFIG_WINDOWS_NATIVE");
disable_feature(destconfig, "CONFIG_WINDOWS_CYGWIN");
- disable_feature(destconfig, "CONFIG_WINDOWS_UBUNTU");
disable_feature(destconfig, "CONFIG_WINDOWS_MSYS");
disable_feature(destconfig, "CONFIG_WINDOWS_OTHER");
@@ -1398,7 +1389,6 @@ static void set_host(const char *destconfig)
printf(" Select Windows/Cygwin host\n");
enable_feature(destconfig, "CONFIG_WINDOWS_CYGWIN");
disable_feature(destconfig, "CONFIG_WINDOWS_MSYS");
- disable_feature(destconfig, "CONFIG_WINDOWS_UBUNTU");
disable_feature(destconfig, "CONFIG_WINDOWS_NATIVE");
break;
@@ -1406,15 +1396,6 @@ static void set_host(const char *destconfig)
printf(" Select Windows/MSYS host\n");
disable_feature(destconfig, "CONFIG_WINDOWS_CYGWIN");
enable_feature(destconfig, "CONFIG_WINDOWS_MSYS");
- disable_feature(destconfig, "CONFIG_WINDOWS_UBUNTU");
- disable_feature(destconfig, "CONFIG_WINDOWS_NATIVE");
- break;
-
- case WINDOWS_UBUNTU:
- printf(" Select Ubuntu for Windows 10 host\n");
- disable_feature(destconfig, "CONFIG_WINDOWS_CYGWIN");
- disable_feature(destconfig, "CONFIG_WINDOWS_MSYS");
- enable_feature(destconfig, "CONFIG_WINDOWS_UBUNTU");
disable_feature(destconfig, "CONFIG_WINDOWS_NATIVE");
break;
@@ -1422,7 +1403,6 @@ static void set_host(const char *destconfig)
printf(" Select Windows native host\n");
disable_feature(destconfig, "CONFIG_WINDOWS_CYGWIN");
disable_feature(destconfig, "CONFIG_WINDOWS_MSYS");
- disable_feature(destconfig, "CONFIG_WINDOWS_UBUNTU");
enable_feature(destconfig, "CONFIG_WINDOWS_NATIVE");
break;
diff --git a/tools/configure.sh b/tools/configure.sh
index 3bcbaef..b31a8bd 100755
--- a/tools/configure.sh
+++ b/tools/configure.sh
@@ -39,7 +39,7 @@ WD=`test -d ${0%/*} && cd ${0%/*}; pwd`
TOPDIR="${WD}/.."
USAGE="
-USAGE: ${0} [-E] [-e] [-l|m|c|u|g|n] [L] [-a <app-dir>] <board-name>:<config-name> [make-opts]
+USAGE: ${0} [-E] [-e] [-l|m|c|g|n] [L] [-a <app-dir>] <board-name>:<config-name> [make-opts]
Where:
-E enforces distclean if already configured.
@@ -47,7 +47,6 @@ Where:
-l selects the Linux (l) host environment.
-m selects the macOS (m) host environment.
-c selects the Windows host and Cygwin (c) environment.
- -u selects the Windows host and Ubuntu under Windows 10 (u) environment.
-g selects the Windows host and MinGW/MSYS environment.
-n selects the Windows host and Windows native (n) environment.
Default: Use host setup in the defconfig file
@@ -95,7 +94,7 @@ while [ ! -z "$1" ]; do
shift
appdir=$1
;;
- -c | -g | -l | -m | -u )
+ -c | -g | -l | -m )
winnative=n
host+=" $1"
;;
diff --git a/tools/sethost.sh b/tools/sethost.sh
index 165ec24..16ff6d5 100755
--- a/tools/sethost.sh
+++ b/tools/sethost.sh
@@ -25,13 +25,12 @@ wenv=
function showusage {
echo ""
- echo "USAGE: $progname [-l|m|c|u|g|n] [make-opts]"
+ echo "USAGE: $progname [-l|m|c|g|n] [make-opts]"
echo " $progname -h"
echo ""
echo "Where:"
- 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"
+ echo " -l|m|c|g|n selects Linux (l), macOS (m), Cygwin (c),"
+ echo " MSYS/MSYS2 (g) or Windows native (n). Default Linux"
echo " make-opts directly pass to make"
echo " -h will show this help test and terminate"
exit 1
@@ -52,10 +51,6 @@ while [ ! -z "$1" ]; do
host=windows
wenv=msys
;;
- -u )
- host=windows
- wenv=ubuntu
- ;;
-m )
host=macos
;;
@@ -171,13 +166,8 @@ else
echo " Select CONFIG_WINDOWS_MSYS=y"
kconfig-tweak --file $nuttx/.config --enable CONFIG_WINDOWS_MSYS
else
- if [ "X$wenv" == "Xubuntu" ]; then
- echo " Select CONFIG_WINDOWS_UBUNTU=y"
- kconfig-tweak --file $nuttx/.config --enable CONFIG_WINDOWS_UBUNTU
- else
- echo " Select CONFIG_WINDOWS_NATIVE=y"
- kconfig-tweak --file $nuttx/.config --enable CONFIG_WINDOWS_NATIVE
- fi
+ echo " Select CONFIG_WINDOWS_NATIVE=y"
+ kconfig-tweak --file $nuttx/.config --enable CONFIG_WINDOWS_NATIVE
fi
fi
fi
diff --git a/tools/testbuild.sh b/tools/testbuild.sh
index 1403d6f..2c4a479 100755
--- a/tools/testbuild.sh
+++ b/tools/testbuild.sh
@@ -49,12 +49,12 @@ GITCLEAN=0
function showusage {
echo ""
- echo "USAGE: $progname [-l|m|c|u|g|n] [-d] [-e <extraflags>] [-x] [-j <ncpus>] [-a <appsdir>] [-t <topdir>] [-p] [-G] <testlist-file>"
+ echo "USAGE: $progname [-l|m|c|g|n] [-d] [-e <extraflags>] [-x] [-j <ncpus>] [-a <appsdir>] [-t <topdir>] [-p] [-G] <testlist-file>"
echo " $progname -h"
echo ""
echo "Where:"
- echo " -l|m|c|u|g|n selects Linux (l), macOS (m), Cygwin (c),"
- echo " Ubuntu under Windows 10 (u), MSYS/MSYS2 (g) or Windows native (n). Default Linux"
+ echo " -l|m|c|g|n selects Linux (l), macOS (m), Cygwin (c),"
+ echo " MSYS/MSYS2 (g) or Windows native (n). Default Linux"
echo " -d enables script debug output"
echo " -e pass extra c/c++ flags such as -Wno-cpp via make command line"
echo " -x exit on build failures"
@@ -81,7 +81,7 @@ function showusage {
while [ ! -z "$1" ]; do
case $1 in
- -l | -m | -c | -u | -g | -n )
+ -l | -m | -c | -g | -n )
HOPTION+=" $1"
;;
-d )