You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by je...@apache.org on 2020/07/29 13:22:31 UTC
[incubator-nuttx-apps] branch master updated (cb9eb7c -> 63cd701)
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git.
from cb9eb7c netutils: webserver: Replace license header with Apache License 2.0
new bc4b6a8 Application.mk: Fix minor bugs
new 088df5f system: Fix typos
new fb26ef2 system/hex2bin: Fix compilation error
new 381b83e tools/check-hash.sh: Add shasum to use checking hash
new 63cd701 Makefile: Unify ROOTDEPPATH into DEPPATH
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:
Application.mk | 12 ++++++------
examples/elf/Makefile | 2 +-
examples/module/Makefile | 2 +-
examples/nxflat/Makefile | 2 +-
examples/posix_spawn/Makefile | 2 +-
examples/sotest/Makefile | 2 +-
examples/thttpd/Makefile | 2 +-
examples/thttpd/content/Makefile.binfs | 2 +-
interpreters/ficl/Makefile | 2 +-
platform/Makefile | 6 +++---
system/hex2bin/Makefile | 2 +-
system/hexed/Makefile | 2 +-
system/setlogmask/Kconfig | 2 +-
system/spi/Kconfig | 2 +-
system/tee/Makefile | 2 +-
system/telnet/Makefile | 4 ++--
tools/check-hash.sh | 9 ++++++++-
17 files changed, 32 insertions(+), 25 deletions(-)
[incubator-nuttx-apps] 04/05: tools/check-hash.sh: Add shasum to
use checking hash
Posted by je...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 381b83ea90db49a4bd03c9dc45aedbb876f32242
Author: SPRESENSE <41...@users.noreply.github.com>
AuthorDate: Tue Jul 28 11:57:30 2020 +0900
tools/check-hash.sh: Add shasum to use checking hash
In macOS, sha*sum tools not found, but shasum can be use instead of them.
---
tools/check-hash.sh | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/tools/check-hash.sh b/tools/check-hash.sh
index a61cf5c..7163fbb 100755
--- a/tools/check-hash.sh
+++ b/tools/check-hash.sh
@@ -71,7 +71,14 @@ esac
# Calculate hash value of passed file
-calc_hash=$( ${hash_algo}sum "${file_to_check}" | cut -d' ' -f1 )
+if [ `which ${hash_algo}sum 2> /dev/null` ]; then
+ hash_algo_cmd="${hash_algo}sum"
+elif [ `which shasum 2> /dev/null` ]; then
+ hash_algo_len=$( echo ${hash_algo} | cut -c 4- )
+ hash_algo_cmd="shasum -a ${hash_algo_len}"
+fi
+
+calc_hash=$( ${hash_algo_cmd} "${file_to_check}" | cut -d' ' -f1 )
# Does it match expected hash?
[incubator-nuttx-apps] 01/05: Application.mk: Fix minor bugs
Posted by je...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit bc4b6a88944034872d9fcc8d4f86d4dbab65d4ae
Author: SPRESENSE <41...@users.noreply.github.com>
AuthorDate: Tue Jul 28 11:57:30 2020 +0900
Application.mk: Fix minor bugs
- Add .config to depend to update Make.dep by config changed
- Fix mkdep error in some Makefiles
Originally, ROOTDEPPATH should be used, but DEPPATH has been already
written in some Makefiles such as littlevgl and pdcur34. This commit
allows the description of DEPPATH instead of ROOTDEPPATH.
---
Application.mk | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/Application.mk b/Application.mk
index 9549f7a..855434b 100644
--- a/Application.mk
+++ b/Application.mk
@@ -88,6 +88,7 @@ ifneq ($(BUILD_MODULE),y)
endif
ROOTDEPPATH += --dep-path .
+ROOTDEPPATH += $(DEPPATH)
ROOTDEPPATH += --obj-path .
ROOTDEPPATH += --obj-suffix $(SUFFIX)$(OBJEXT)
@@ -223,11 +224,11 @@ else
context::
endif
-.depend: Makefile $(wildcard $(foreach SRC, $(SRCS), $(addsuffix /$(SRC), $(subst :, ,$(VPATH)))))
+.depend: Makefile $(wildcard $(foreach SRC, $(SRCS), $(addsuffix /$(SRC), $(subst :, ,$(VPATH))))) $(DEPCONFIG)
ifeq ($(filter %$(CXXEXT),$(SRCS)),)
- $(Q) $(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(filter-out Makefile,$^) >Make.dep
+ $(Q) $(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(filter-out Makefile,$(filter-out $(DEPCONFIG),$^)) >Make.dep
else
- $(Q) $(MKDEP) $(ROOTDEPPATH) "$(CXX)" -- $(CXXFLAGS) -- $(filter-out Makefile,$^) >Make.dep
+ $(Q) $(MKDEP) $(ROOTDEPPATH) "$(CXX)" -- $(CXXFLAGS) -- $(filter-out Makefile,$(filter-out $(DEPCONFIG),$^)) >Make.dep
endif
$(Q) touch $@
[incubator-nuttx-apps] 05/05: Makefile: Unify ROOTDEPPATH into
DEPPATH
Posted by je...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 63cd701958d729cf05aea1d35618f6da122f1843
Author: SPRESENSE <41...@users.noreply.github.com>
AuthorDate: Wed Jul 29 13:28:00 2020 +0900
Makefile: Unify ROOTDEPPATH into DEPPATH
DEPPATH is commonly used in nuttx repo, so it to be the same with them.
---
Application.mk | 11 +++++------
examples/elf/Makefile | 2 +-
examples/module/Makefile | 2 +-
examples/nxflat/Makefile | 2 +-
examples/posix_spawn/Makefile | 2 +-
examples/sotest/Makefile | 2 +-
examples/thttpd/Makefile | 2 +-
examples/thttpd/content/Makefile.binfs | 2 +-
interpreters/ficl/Makefile | 2 +-
platform/Makefile | 6 +++---
system/hexed/Makefile | 2 +-
11 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/Application.mk b/Application.mk
index 855434b..153628a 100644
--- a/Application.mk
+++ b/Application.mk
@@ -87,10 +87,9 @@ ifneq ($(BUILD_MODULE),y)
OBJS += $(MAINOBJ)
endif
-ROOTDEPPATH += --dep-path .
-ROOTDEPPATH += $(DEPPATH)
-ROOTDEPPATH += --obj-path .
-ROOTDEPPATH += --obj-suffix $(SUFFIX)$(OBJEXT)
+DEPPATH += --dep-path .
+DEPPATH += --obj-path .
+DEPPATH += --obj-suffix $(SUFFIX)$(OBJEXT)
VPATH += :.
@@ -226,9 +225,9 @@ endif
.depend: Makefile $(wildcard $(foreach SRC, $(SRCS), $(addsuffix /$(SRC), $(subst :, ,$(VPATH))))) $(DEPCONFIG)
ifeq ($(filter %$(CXXEXT),$(SRCS)),)
- $(Q) $(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(filter-out Makefile,$(filter-out $(DEPCONFIG),$^)) >Make.dep
+ $(Q) $(MKDEP) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(filter-out Makefile,$(filter-out $(DEPCONFIG),$^)) >Make.dep
else
- $(Q) $(MKDEP) $(ROOTDEPPATH) "$(CXX)" -- $(CXXFLAGS) -- $(filter-out Makefile,$(filter-out $(DEPCONFIG),$^)) >Make.dep
+ $(Q) $(MKDEP) $(DEPPATH) "$(CXX)" -- $(CXXFLAGS) -- $(filter-out Makefile,$(filter-out $(DEPCONFIG),$^)) >Make.dep
endif
$(Q) touch $@
diff --git a/examples/elf/Makefile b/examples/elf/Makefile
index 6cedf90..e6bf6c5 100644
--- a/examples/elf/Makefile
+++ b/examples/elf/Makefile
@@ -52,7 +52,7 @@ PRIORITY = SCHED_PRIORITY_DEFAULT
STACKSIZE = $(CONFIG_DEFAULT_TASK_STACKSIZE)
MODULE = $(CONFIG_EXAMPLES_ELF)
-ROOTDEPPATH := --dep-path tests
+DEPPATH := --dep-path tests
# Build targets
diff --git a/examples/module/Makefile b/examples/module/Makefile
index 5267c9f..5dfc173 100644
--- a/examples/module/Makefile
+++ b/examples/module/Makefile
@@ -54,7 +54,7 @@ CSRCS += mod_symtab.c
MAINSRC = module_main.c
VPATH += drivers
-ROOTDEPPATH += --dep-path drivers
+DEPPATH += --dep-path drivers
# Build targets
diff --git a/examples/nxflat/Makefile b/examples/nxflat/Makefile
index 3ecf369..68ae086 100644
--- a/examples/nxflat/Makefile
+++ b/examples/nxflat/Makefile
@@ -47,7 +47,7 @@ PRIORITY = SCHED_PRIORITY_DEFAULT
STACKSIZE = $(CONFIG_DEFAULT_TASK_STACKSIZE)
MODULE = $(CONFIG_EXAMPLES_NXFLAT)
-ROOTDEPPATH := --dep-path tests
+DEPPATH := --dep-path tests
VPATH += :tests
diff --git a/examples/posix_spawn/Makefile b/examples/posix_spawn/Makefile
index eb76777..8b84ee7 100644
--- a/examples/posix_spawn/Makefile
+++ b/examples/posix_spawn/Makefile
@@ -46,7 +46,7 @@ PRIORITY = SCHED_PRIORITY_DEFAULT
STACKSIZE = $(CONFIG_DEFAULT_TASK_STACKSIZE)
MODULE = $(CONFIG_EXAMPLES_POSIXSPAWN)
-ROOTDEPPATH += --dep-path filesystem
+DEPPATH += --dep-path filesystem
# Build targets
diff --git a/examples/sotest/Makefile b/examples/sotest/Makefile
index 08802a8..edc8245 100644
--- a/examples/sotest/Makefile
+++ b/examples/sotest/Makefile
@@ -50,7 +50,7 @@ endif
CSRCS += sot_symtab.c
MAINSRC = sotest_main.c
-ROOTDEPPATH += --dep-path lib
+DEPPATH += --dep-path lib
# Build targets
diff --git a/examples/thttpd/Makefile b/examples/thttpd/Makefile
index 61faf42..38d8945 100644
--- a/examples/thttpd/Makefile
+++ b/examples/thttpd/Makefile
@@ -54,7 +54,7 @@ STACKSIZE = $(CONFIG_DEFAULT_TASK_STACKSIZE)
MODULE = $(CONFIG_EXAMPLES_THTTPD)
VPATH += content
-ROOTDEPPATH += --dep-path content
+DEPPATH += --dep-path content
content/romfs.c: build
ifeq ($(CONFIG_THTTPD_NXFLAT),y)
diff --git a/examples/thttpd/content/Makefile.binfs b/examples/thttpd/content/Makefile.binfs
index 161751e..6df736e 100644
--- a/examples/thttpd/content/Makefile.binfs
+++ b/examples/thttpd/content/Makefile.binfs
@@ -41,7 +41,7 @@ STACKSIZE = $(CONFIG_THTTPD_CGI_STACKSIZE)
CSRCS = hello.c tasks.c
-ROOTDEPPATH += --dep-path hello --dep-path tasks
+DEPPATH += --dep-path hello --dep-path tasks
VPATH += :hello:tasks
include $(APPDIR)/Application.mk
diff --git a/interpreters/ficl/Makefile b/interpreters/ficl/Makefile
index 0dd1fe3..c3991af 100644
--- a/interpreters/ficl/Makefile
+++ b/interpreters/ficl/Makefile
@@ -53,7 +53,7 @@ ASRCS += $(FICL_ASRCS)
CXXSRCS += $(FICL_CXXSRCS)
CSRCS += $(FICL_CSRCS)
-ROOTDEPPATH += --dep-path src
+DEPPATH += --dep-path src
VPATH += :src:$(FICL_SUBDIR)
diff --git a/platform/Makefile b/platform/Makefile
index ee692f1..098bf42 100644
--- a/platform/Makefile
+++ b/platform/Makefile
@@ -50,9 +50,9 @@ else
endif
VPATH += board
-ROOTDEPPATH += --obj-path bin
-ROOTDEPPATH += --obj-suffix $(OBJEXT)
-ROOTDEPPATH += --dep-path $(PLATFORMDIR)
+DEPPATH += --obj-path bin
+DEPPATH += --obj-suffix $(OBJEXT)
+DEPPATH += --dep-path $(PLATFORMDIR)
# Binaries
diff --git a/system/hexed/Makefile b/system/hexed/Makefile
index 42cadc2..cce85aa 100644
--- a/system/hexed/Makefile
+++ b/system/hexed/Makefile
@@ -49,6 +49,6 @@ MAINSRC = hexed.c
CFLAGS += ${shell $(INCDIR) "$(CC)" include}
VPATH += :src
-ROOTDEPPATH += --dep-path src
+DEPPATH += --dep-path src
include $(APPDIR)/Application.mk
[incubator-nuttx-apps] 02/05: system: Fix typos
Posted by je...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 088df5f156b8fd9ae16e5a8673c1feb06e12a45c
Author: SPRESENSE <41...@users.noreply.github.com>
AuthorDate: Tue Jul 28 11:57:30 2020 +0900
system: Fix typos
Fix typos in following files:
- system/setlogmask/Kconfig
- system/tee/Makefile
- system/telnet/Makefile
- system/spi/Kconfig
---
system/setlogmask/Kconfig | 2 +-
system/spi/Kconfig | 2 +-
system/tee/Makefile | 2 +-
system/telnet/Makefile | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/system/setlogmask/Kconfig b/system/setlogmask/Kconfig
index 1f31eaf..c83e0b2 100644
--- a/system/setlogmask/Kconfig
+++ b/system/setlogmask/Kconfig
@@ -21,7 +21,7 @@ config SYSTEM_SETLOGMASK_PRIORITY
int "setlogmask task priority"
default 100
-config SYSTEM_SET_LOGMASK_STACKSIZE
+config SYSTEM_SETLOGMASK_STACKSIZE
int "setlogmask stack size"
default DEFAULT_TASK_STACKSIZE
diff --git a/system/spi/Kconfig b/system/spi/Kconfig
index 42b9bae..cbd6a57 100644
--- a/system/spi/Kconfig
+++ b/system/spi/Kconfig
@@ -15,7 +15,7 @@ if SYSTEM_SPITOOL
config SPITOOL_PROGNAME
string "Program name"
- default "hello"
+ default "spi"
---help---
This is the name of the program that will be used when the ELF
program is installed.
diff --git a/system/tee/Makefile b/system/tee/Makefile
index f8153fe..ca1929d 100644
--- a/system/tee/Makefile
+++ b/system/tee/Makefile
@@ -41,7 +41,7 @@ include $(APPDIR)/Make.defs
PROGNAME = tee
PRIORITY = $(CONFIG_SYSTEM_TEE_PRIORITY)
-STACKSIZE = $(CONFIG_SYSTEM_TEE_PRIORITY)
+STACKSIZE = $(CONFIG_SYSTEM_TEE_STACKSIZE)
MODULE = $(CONFIG_SYSTEM_TEE)
MAINSRC = tee.c
diff --git a/system/telnet/Makefile b/system/telnet/Makefile
index 792f0cd..f90df9b 100644
--- a/system/telnet/Makefile
+++ b/system/telnet/Makefile
@@ -43,7 +43,7 @@ PROGNAME = $(CONFIG_SYSTEM_TELNET_CHATD_PROGNAME)
PRIORITY = $(CONFIG_SYSTEM_TELNET_CHATD_PRIORITY)
STACKSIZE = $(CONFIG_SYSTEM_TELNET_CHATD_STACKSIZE)
-MODULE = $(CONFIG_CONFIG_SYSTEM_TELNET_CHATD)
+MODULE = $(CONFIG_SYSTEM_TELNET_CHATD)
endif
@@ -55,7 +55,7 @@ PROGNAME += $(CONFIG_SYSTEM_TELNET_CLIENT_PROGNAME)
PRIORITY += $(CONFIG_SYSTEM_TELNET_CLIENT_PRIORITY)
STACKSIZE += $(CONFIG_SYSTEM_TELNET_CLIENT_STACKSIZE)
-MODULE = $(CONFIG_CONFIG_SYSTEM_TELNET_CLIENT)
+MODULE = $(CONFIG_SYSTEM_TELNET_CLIENT)
endif
[incubator-nuttx-apps] 03/05: system/hex2bin: Fix compilation error
Posted by je...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit fb26ef28c61315a6d2734e52c33118a67568be62
Author: SPRESENSE <41...@users.noreply.github.com>
AuthorDate: Tue Jul 28 11:57:30 2020 +0900
system/hex2bin: Fix compilation error
Avoid overwrite the PROGNAME.
---
system/hex2bin/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/system/hex2bin/Makefile b/system/hex2bin/Makefile
index ed98296..335d496 100644
--- a/system/hex2bin/Makefile
+++ b/system/hex2bin/Makefile
@@ -46,7 +46,7 @@ endif
ifeq ($(CONFIG_SYSTEM_HEX2MEM_BUILTIN),y)
MAINSRC += hex2mem_main.c
- PROGNAME = hex2mem
+ PROGNAME += hex2mem
STACKSIZE += $(CONFIG_SYSTEM_HEX2MEM_STACKSIZE)
PRIORITY += $(CONFIG_SYSTEM_HEX2MEM_PRIORITY)
endif