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/03/19 23:30:26 UTC
[incubator-nuttx-apps] branch master updated (0e13730 -> 47c0df6)
This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git.
from 0e13730 Merge pull request #120 from liuguo09/posix_spawn_nightly_build_fix
new 06c9f93 Makefile: remove context dependency to avoid apps context build twice
new d788637 Revert "examples/posix_spawn: Fix parallel build errors at link time"
new 47c0df6 Revert "examples: elf: Fix parallel build errors at link time"
The 3 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:
Makefile | 2 +-
examples/elf/tests/Makefile | 3 +--
examples/posix_spawn/filesystem/Makefile | 3 +--
3 files changed, 3 insertions(+), 5 deletions(-)
[incubator-nuttx-apps] 01/03: Makefile: remove context dependency
to avoid apps context build twice
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 06c9f9359ef7949cd36eeb9b5c6ba53cd5abbfe6
Author: liuhaitao <li...@xiaomi.com>
AuthorDate: Wed Mar 18 20:30:50 2020 +0800
Makefile: remove context dependency to avoid apps context build twice
In nuttx pass1dep and pass2dep builds, context firstly would be built once.
It then call 'make -C apps depend' which would trigger the context built twice.
There is race condition between symtab.c generated by mksymtab.sh in second time
and compiling symtab.c in parallel build. So remove context dependency for apps
depend to make sure context build only one time for apps.
Parallel build break logs as below:
/home/jenkins/jenkins-slave/workspace/NuttX-Nightly-Build/apps/examples/elf/elf_main.c:357: undefined reference to `g_elf_nexports'
riscv64-unknown-elf-ld: /home/jenkins/jenkins-slave/workspace/NuttX-Nightly-Build/apps/examples/elf/elf_main.c:357: undefined reference to `g_elf_exports'
make[1]: *** [nuttx] Error 1
make: *** [pass2] Error 2
Change-Id: I2872f7036e7ec86615efc5ebd7c46cee51dc1094
Signed-off-by: liuhaitao <li...@xiaomi.com>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 6744ef7..5956c64 100644
--- a/Makefile
+++ b/Makefile
@@ -167,7 +167,7 @@ endif
.depdirs: $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_depend)
-.depend: context Makefile .depdirs
+.depend: Makefile .depdirs
$(Q) touch $@
depend: .depend
[incubator-nuttx-apps] 03/03: Revert "examples: elf: Fix parallel
build errors at link time"
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 47c0df6ae6ad6453b38e4035f6d73f24f797b52b
Author: liuhaitao <li...@xiaomi.com>
AuthorDate: Thu Mar 19 20:11:34 2020 +0800
Revert "examples: elf: Fix parallel build errors at link time"
This reverts commit 176fd27c8ab9e9eb7d72b5501a8acca94cc38734.
---
examples/elf/tests/Makefile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/examples/elf/tests/Makefile b/examples/elf/tests/Makefile
index 03c1ca3..fd97821 100644
--- a/examples/elf/tests/Makefile
+++ b/examples/elf/tests/Makefile
@@ -141,8 +141,7 @@ $(DIRLIST_HDR) : populate
# Create the exported symbol table
$(SYMTAB_SRC): populate
- $(Q) $(TESTS_DIR)/mksymtab.sh $(FSIMG_DIR) >$@_tmp
- $(Q) mv $@_tmp $@
+ $(Q) $(TESTS_DIR)/mksymtab.sh $(FSIMG_DIR) >$@
# Clean each subdirectory
[incubator-nuttx-apps] 02/03: Revert "examples/posix_spawn: Fix
parallel build errors at link time"
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit d7886374bc10c488a281a065a1f4aa61456fcf76
Author: liuhaitao <li...@xiaomi.com>
AuthorDate: Thu Mar 19 20:11:23 2020 +0800
Revert "examples/posix_spawn: Fix parallel build errors at link time"
This reverts commit 73319a6968ad39e65698dbf10b3b14bb9a247132.
---
examples/posix_spawn/filesystem/Makefile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/examples/posix_spawn/filesystem/Makefile b/examples/posix_spawn/filesystem/Makefile
index aa6dece..c9541ef 100644
--- a/examples/posix_spawn/filesystem/Makefile
+++ b/examples/posix_spawn/filesystem/Makefile
@@ -78,8 +78,7 @@ $(ROMFS_HDR) : $(ROMFS_IMG)
# Create the exported symbol table
$(SYMTAB_SRC): $(ROMFS_IMG)
- $(Q) $(FILESYSTEM_DIR)$(DELIM)mksymtab.sh $(ROMFS_DIR) >$@_tmp
- $(Q) mv $@_tmp $@
+ $(Q) $(FILESYSTEM_DIR)$(DELIM)mksymtab.sh $(ROMFS_DIR) >$@
# Clean each subdirectory