You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2020/06/10 13:32:04 UTC
[incubator-nuttx-apps] branch master updated (afaf013 -> 68c89e8)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git.
from afaf013 examples/lvgldemo: Make touch calibration optional
new 0b322c9 examples/thttpd: update Makefile etc to fix build break
new 68c89e8 tools/mksymtab.sh: remove the quotes in varlist entry coming from *-thunk.S
The 2 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:
examples/thttpd/content/Makefile.nxflat | 4 +++-
examples/thttpd/thttpd_main.c | 2 +-
tools/mksymtab.sh | 6 ++++--
3 files changed, 8 insertions(+), 4 deletions(-)
[incubator-nuttx-apps] 02/02: tools/mksymtab.sh: remove the quotes
in varlist entry coming from *-thunk.S
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 68c89e84852a26d54d6850be87dfcd48fff09f49
Author: liuhaitao <li...@xiaomi.com>
AuthorDate: Wed Jun 10 19:36:59 2020 +0800
tools/mksymtab.sh: remove the quotes in varlist entry coming from *-thunk.S
Signed-off-by: liuhaitao <li...@xiaomi.com>
---
tools/mksymtab.sh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tools/mksymtab.sh b/tools/mksymtab.sh
index 811a886..064907b 100755
--- a/tools/mksymtab.sh
+++ b/tools/mksymtab.sh
@@ -72,7 +72,8 @@ echo "#include <nuttx/compiler.h>"
echo "#include <nuttx/symtab.h>"
echo ""
-for var in $varlist; do
+for string in $varlist; do
+ var=`echo $string | sed -e "s/\"//g"`
echo "extern void *${var};"
done
@@ -90,7 +91,8 @@ else
fi
echo "{"
-for var in $varlist; do
+for string in $varlist; do
+ var=`echo $string | sed -e "s/\"//g"`
echo " {\"${var}\", &${var}},"
done
[incubator-nuttx-apps] 01/02: examples/thttpd: update Makefile etc
to fix build break
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 0b322c9784136a4168aaa44537a798d7cda26dd2
Author: liuhaitao <li...@xiaomi.com>
AuthorDate: Wed Jun 10 19:34:53 2020 +0800
examples/thttpd: update Makefile etc to fix build break
Signed-off-by: liuhaitao <li...@xiaomi.com>
---
examples/thttpd/content/Makefile.nxflat | 4 +++-
examples/thttpd/thttpd_main.c | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/examples/thttpd/content/Makefile.nxflat b/examples/thttpd/content/Makefile.nxflat
index 7384242..fc793da 100644
--- a/examples/thttpd/content/Makefile.nxflat
+++ b/examples/thttpd/content/Makefile.nxflat
@@ -33,6 +33,8 @@
#
############################################################################
+include $(TOPDIR)/Make.defs
+
SUBDIRS = hello tasks
INSTALL_FILES = index.html style.css
@@ -76,7 +78,7 @@ $(ROMFS_SRC): $(ROMFS_IMG)
# Create the exported symbol table list from the derived *-thunk.S files
$(SYMTAB_SRC): install
- $(Q) $(APPDIR)$(DELIM)tools$(DELIM)mksymtab.sh $(CONTENT_DIR) g_thttpd >$@.tmp
+ $(Q) $(APPDIR)/tools/mksymtab.sh $(CONTENT_DIR) g_thttpd >$@.tmp
$(Q) $(call TESTANDREPLACEFILE, $@.tmp, $@)
# Nothing special needs to be done during the context phase
diff --git a/examples/thttpd/thttpd_main.c b/examples/thttpd/thttpd_main.c
index 5812c0c..1b4dff3 100644
--- a/examples/thttpd/thttpd_main.c
+++ b/examples/thttpd/thttpd_main.c
@@ -183,7 +183,7 @@ int g_thttpdnsymbols;
extern const unsigned char romfs_img[];
extern const unsigned int romfs_img_len;
-#ifdef CONFIG_THTTPD_FLAT
+#ifdef CONFIG_THTTPD_NXFLAT
extern const struct symtab_s g_thttpd_exports[];
extern const int g_thttpd_nexports;
#endif