On Tue, Sep 24, 2019 at 08:59:34PM +0000, Joe Hershberger wrote:
On Tue, Sep 24, 2019 at 3:45 PM Tom Rini trini@konsulko.com wrote:
On Tue, Sep 24, 2019 at 08:29:51PM +0000, Joe Hershberger wrote:
Hi Tom,
On Tue, Sep 24, 2019 at 2:52 PM Tom Rini trini@konsulko.com wrote:
On Tue, Sep 24, 2019 at 01:15:34PM +0200, Pierre-Jean Texier wrote:
Hi Vagrant,
Le 24/09/2019 à 04:04, Vagrant Cascadian a écrit :
I've been unable to successfully run "make envtools" on recent versions of u-boot, and finally got a chance to git bisect it.
It looks like commit 9fb625ce05539fe6876a59ce1dcadb76b33c6f6e, introduced after 2019.10-rc1, breaks building envtools:
#!/bin/sh # test-bisect set -e set -x make clean make tools-only_defconfig make NO_SDL=1 envtools
.... Bisecting: 8 revisions left to test after this (roughly 3 steps) [9fb625ce05539fe6876a59ce1dcadb76b33c6f6e] env: Move env_set() to env.h running ../test-bisect
- make clean CLEAN u-boot.cfg
- make tools-only_defconfig HOSTCC scripts/basic/fixdep HOSTCC scripts/kconfig/conf.o YACC scripts/kconfig/zconf.tab.c LEX scripts/kconfig/zconf.lex.c HOSTCC scripts/kconfig/zconf.tab.o HOSTLD scripts/kconfig/conf
# # configuration written to .config #
- make NO_SDL=1 envtools
scripts/kconfig/conf --syncconfig Kconfig CHK include/config.h CFG u-boot.cfg GEN include/autoconf.mk GEN include/autoconf.mk.dep CHK include/config/uboot.release UPD include/config/uboot.release CHK include/generated/version_autogenerated.h UPD include/generated/version_autogenerated.h CHK include/generated/timestamp_autogenerated.h UPD include/generated/timestamp_autogenerated.h LD tools/env/built-in.o HOSTCC tools/env/crc32.o HOSTCC tools/env/ctype.o HOSTCC tools/env/env_attr.o HOSTCC tools/env/env_flags.o In file included from tools/env/../../env/flags.c:7, from tools/env/env_flags.c:1: include/env.h:97:1: error: unknown type name 'ulong'; did you mean 'long'? 97 | ulong env_get_ulong(const char *name, int base, ulong default_val); | ^~~~~ | long include/env.h:97:49: error: unknown type name 'ulong'; did you mean 'long'? 97 | ulong env_get_ulong(const char *name, int base, ulong default_val); | ^~~~~ | long include/env.h:106:40: error: unknown type name 'ulong'; did you mean 'long'? 106 | int env_set_ulong(const char *varname, ulong value); | ^~~~~ | long include/env.h:118:1: error: unknown type name 'ulong'; did you mean 'long'? 118 | ulong env_get_hex(const char *varname, ulong default_val); | ^~~~~ | long include/env.h:118:40: error: unknown type name 'ulong'; did you mean 'long'? 118 | ulong env_get_hex(const char *varname, ulong default_val); | ^~~~~ | long include/env.h:127:38: error: unknown type name 'ulong'; did you mean 'long'? 127 | int env_set_hex(const char *varname, ulong value); | ^~~~~ | long include/env.h: In function 'env_set_addr': include/env.h:138:31: error: 'ulong' undeclared (first use in this function) 138 | return env_set_hex(varname, (ulong)addr); | ^~~~~ include/env.h:138:31: note: each undeclared identifier is reported only once for each function it appears in include/env.h:138:37: error: expected ')' before 'addr' 138 | return env_set_hex(varname, (ulong)addr); | ^~~~ | ) make[1]: *** [scripts/Makefile.host:114: tools/env/env_flags.o] Error 1 make: *** [Makefile:1778: envtools] Error 2 Bisecting: 3 revisions left to test after this (roughly 2 steps) ... Bisecting: 0 revisions left to test after this (roughly 0 steps) [cdbff9fc4002fdd47181088d5abe90e5f2fa1904] env: Move env_get_hex() to ... 9fb625ce05539fe6876a59ce1dcadb76b33c6f6e is the first bad commit commit 9fb625ce05539fe6876a59ce1dcadb76b33c6f6e Author: Simon Glass sjg@chromium.org Date: Thu Aug 1 09:46:51 2019 -0600
env: Move env_set() to env.h Move env_set() over to the new header file. Acked-by: Joe Hershberger <joe.hershberger@ni.com> Signed-off-by: Simon Glass <sjg@chromium.org>Would be great to get this building again before 2019.10 release!
I sent the following series to fix this build issue:
Hope it will be merged soon.
Looks like we also need to change travis/gitlab to building "tools-all" not "tools-only". Can someone send a patch please? And Joe, are you happy with those env changes? Thanks!
Yes, I've acked those patches. I can pull them through the net tree if you like.
Ah, good. How do you want to handle stuff moving forward? I can take a PR when you're ready with stuff or I can just make sure it has you or Wolfgang ack/reviewed-by before grabbing myself. Thanks!
I'm hoping the volume will be pretty low, so lets start with just looking for an Acked-by and go from there. We can later decide if we use an env/master branch in the net tree or add another tree if the volume makes the first approach unattractive.
OK, thanks!