Fix externalsrc harder #83

peterhurley · 2022-12-13T02:37:31Z

Add fixes for submodule handling in srctree_hash_files() after upstream broken fixes when git submodule-helper list was deprecated.

oe-core commit 6d9364e "externalsrc: git submodule--helper list unsupported" caused build errors and does the wrong thing because it: 1. checks for .gitmodules in bitbake's cwd which could be anywhere and unrelated to the srcdir/EXTERNALSRC 2. enumerates inactive submodules which won't have initialized repos oe-core commit 66ff3d1 "externalsrc: fix lookup for .gitmodules" fixed 1 but not 2. Instead, still attempt to use list subcommand to enumerate active submodules, and if unsuccessful (because list is unsupported) [1], enumerate active submodule paths via the more modern "foreach" subcommand [2]. Avoiding the git submodule porcelain is still necessary for the reasons detailed in oe-core commit 2055718 "Revert "externalsrc: Detect code changes in submodules". Both subcommands output the submodule path relative to the immediate superproject; parse last column of either output [3][4] as submodule path. [1] 31955475d1c2 "submodule--helper: remove unused "list" helper" [2] foreach subcommand added to git submodule--helper in git v2.19.0 fc1b9243cd5d submodule: port submodule subcommand 'foreach' from shell to C and --quiet option fixed in git v2.22.0 a282f5a90613 submodule foreach: fix "<command> --quiet" not being respected [3] example output of 'git submodule--helper list' $ git submodule--helper list 160000 48de465976bffb76853b2e17c1c9b65bada30d2a 0 path/to/submodule_A 160000 4c34ba86f96944153b6c6566a1bceaeace25aa07 0 deeper/path/to/submodule_B [4] example output of "git submodule--helper foreach 'echo $path'" path/to/submodule_A deeper/path/to/submodule_B Change-Id: I67915f54df7c802d1659b8f132426df60e24480f Signed-off-by: Peter Hurley <[email protected]>

Submodule paths output by git submodule--helper subcommands are relative to the containing superproject top-level directory, whereas scrdir/EXTERNALSRC may be a subdirectory _within_ a superproject and not necessarily equivalent to the top-level directory. Form submodule paths from top-level directory [1] and only process submodules where srcdir/EXTERNALSRC is a parent path of the submodule path [2]. [1] which may not be equivalent to git_dir in a git worktree [2] uses os.path.commonpath() available since python 3.5 Change-Id: I94d40074586469242228a63ef66089f9f97d1159 Signed-off-by: Peter Hurley <[email protected]>

Changelog: ============ ### Changes - Add reload command for systemd service - Add global log rotation options to .conf file, issue #80. Introducing two new settings: 'rotate_size SIZE' and 'rotate_count COUNT' - Semantic change for per-file log rotation settings, no longer possible to disable log rotation for a file by setting 'rotate=0:0' - Possible to set only size or count rotation per file - Add support for 'listen addr:port' to .conf file, issue #83 ### Fixes - Fix #72: loss of raw kernel log messages to console. - Fix #81: blocking delay for unreachable remote log server. - Fix #82: retry creating UNIX and network sockets on failure. Signed-off-by: Wang Mingyu <[email protected]> Signed-off-by: Alexandre Belloni <[email protected]> Signed-off-by: Richard Purdie <[email protected]>

Add ptest support for libyaml to enable running the test suite on target devices. This includes: - test-version: Verifies library version information - test-reader: Tests YAML reading functionality All 2 upstream tests pass successfully: START: ptest-runner BEGIN: /usr/lib/libyaml/ptest checking utf-8 sequences... a simple test: + (no error) an empty line: + (no error) u-0 is a control character: + (reader error: control characters are not allowed: #0 at 0) u-80 is a control character: + (reader error: control characters are not allowed: #80 at 0) u-800 is valid: + (no error) u-10000 is valid: + (no error) 5 bytes sequences are not allowed: + (reader error: invalid leading UTF-8 octet: #F8 at 0) 6 bytes sequences are not allowed: + (reader error: invalid leading UTF-8 octet: #FC at 0) u-7f is a control character: + (reader error: control characters are not allowed: #7F at 0) u-7FF is valid: + (no error) u-FFFF is a control character: + (reader error: control characters are not allowed: #FFFF at 0) u-1FFFFF is too large: + (reader error: invalid Unicode character: #1FFFFF at 0) u-3FFFFFF is 5 bytes: + (reader error: invalid leading UTF-8 octet: #FB at 0) u-7FFFFFFF is 6 bytes: + (reader error: invalid leading UTF-8 octet: #FD at 0) u-D7FF: + (no error) u-E000: + (no error) u-FFFD: + (no error) u-10FFFF: + (no error) u-110000: + (reader error: invalid Unicode character: #110000 at 0) first continuation byte: + (reader error: invalid leading UTF-8 octet: #80 at 0) last continuation byte: + (reader error: invalid leading UTF-8 octet: #BF at 0) 2 continuation bytes: + (reader error: invalid leading UTF-8 octet: #80 at 0) 3 continuation bytes: + (reader error: invalid leading UTF-8 octet: #80 at 0) 4 continuation bytes: + (reader error: invalid leading UTF-8 octet: #80 at 0) 5 continuation bytes: + (reader error: invalid leading UTF-8 octet: #80 at 0) 6 continuation bytes: + (reader error: invalid leading UTF-8 octet: #80 at 0) 7 continuation bytes: + (reader error: invalid leading UTF-8 octet: #80 at 0) sequence of all 64 possible continuation bytes: + (reader error: invalid leading UTF-8 octet: #80 at 0) + (reader error: invalid leading UTF-8 octet: #81 at 0) + (reader error: invalid leading UTF-8 octet: #82 at 0) + (reader error: invalid leading UTF-8 octet: #83 at 0) + (reader error: invalid leading UTF-8 octet: #84 at 0) + (reader error: invalid leading UTF-8 octet: #85 at 0) + (reader error: invalid leading UTF-8 octet: #86 at 0) + (reader error: invalid leading UTF-8 octet: #87 at 0) + (reader error: invalid leading UTF-8 octet: #88 at 0) + (reader error: invalid leading UTF-8 octet: #89 at 0) + (reader error: invalid leading UTF-8 octet: #8A at 0) + (reader error: invalid leading UTF-8 octet: #8B at 0) + (reader error: invalid leading UTF-8 octet: #8C at 0) + (reader error: invalid leading UTF-8 octet: #8D at 0) + (reader error: invalid leading UTF-8 octet: #8E at 0) + (reader error: invalid leading UTF-8 octet: #8F at 0) + (reader error: invalid leading UTF-8 octet: #90 at 0) + (reader error: invalid leading UTF-8 octet: #91 at 0) + (reader error: invalid leading UTF-8 octet: #92 at 0) + (reader error: invalid leading UTF-8 octet: #93 at 0) + (reader error: invalid leading UTF-8 octet: #94 at 0) + (reader error: invalid leading UTF-8 octet: #95 at 0) + (reader error: invalid leading UTF-8 octet: #96 at 0) + (reader error: invalid leading UTF-8 octet: #97 at 0) + (reader error: invalid leading UTF-8 octet: #98 at 0) + (reader error: invalid leading UTF-8 octet: #99 at 0) + (reader error: invalid leading UTF-8 octet: #9A at 0) + (reader error: invalid leading UTF-8 octet: #9B at 0) + (reader error: invalid leading UTF-8 octet: #9C at 0) + (reader error: invalid leading UTF-8 octet: #9D at 0) + (reader error: invalid leading UTF-8 octet: #9E at 0) + (reader error: invalid leading UTF-8 octet: #9F at 0) + (reader error: invalid leading UTF-8 octet: #A0 at 0) + (reader error: invalid leading UTF-8 octet: #A1 at 0) + (reader error: invalid leading UTF-8 octet: #A2 at 0) + (reader error: invalid leading UTF-8 octet: #A3 at 0) + (reader error: invalid leading UTF-8 octet: #A4 at 0) + (reader error: invalid leading UTF-8 octet: #A5 at 0) + (reader error: invalid leading UTF-8 octet: #A6 at 0) + (reader error: invalid leading UTF-8 octet: #A7 at 0) + (reader error: invalid leading UTF-8 octet: #A8 at 0) + (reader error: invalid leading UTF-8 octet: #A9 at 0) + (reader error: invalid leading UTF-8 octet: #AA at 0) + (reader error: invalid leading UTF-8 octet: #AB at 0) + (reader error: invalid leading UTF-8 octet: #AC at 0) + (reader error: invalid leading UTF-8 octet: #AD at 0) + (reader error: invalid leading UTF-8 octet: #AE at 0) + (reader error: invalid leading UTF-8 octet: #AF at 0) + (reader error: invalid leading UTF-8 octet: #B0 at 0) + (reader error: invalid leading UTF-8 octet: #B1 at 0) + (reader error: invalid leading UTF-8 octet: #B2 at 0) + (reader error: invalid leading UTF-8 octet: #B3 at 0) + (reader error: invalid leading UTF-8 octet: #B4 at 0) + (reader error: invalid leading UTF-8 octet: #B5 at 0) + (reader error: invalid leading UTF-8 octet: #B6 at 0) + (reader error: invalid leading UTF-8 octet: #B7 at 0) + (reader error: invalid leading UTF-8 octet: #B8 at 0) + (reader error: invalid leading UTF-8 octet: #B9 at 0) + (reader error: invalid leading UTF-8 octet: #BA at 0) + (reader error: invalid leading UTF-8 octet: #BB at 0) + (reader error: invalid leading UTF-8 octet: #BC at 0) + (reader error: invalid leading UTF-8 octet: #BD at 0) + (reader error: invalid leading UTF-8 octet: #BE at 0) + (reader error: invalid leading UTF-8 octet: #BF at 0) 32 first bytes of 2-byte sequences {0xc0-0xdf}: + (reader error: invalid trailing UTF-8 octet: #20 at 1) + (reader error: invalid trailing UTF-8 octet: #20 at 1) + (reader error: invalid trailing UTF-8 octet: #20 at 1) + (reader error: invalid trailing UTF-8 octet: #20 at 1) + (reader error: invalid trailing UTF-8 octet: #20 at 1) + (reader error: invalid trailing UTF-8 octet: #20 at 1) + (reader error: invalid trailing UTF-8 octet: #20 at 1) + (reader error: invalid trailing UTF-8 octet: #20 at 1) + (reader error: invalid trailing UTF-8 octet: #20 at 1) + (reader error: invalid trailing UTF-8 octet: #20 at 1) + (reader error: invalid trailing UTF-8 octet: #20 at 1) + (reader error: invalid trailing UTF-8 octet: #20 at 1) + (reader error: invalid trailing UTF-8 octet: #20 at 1) + (reader error: invalid trailing UTF-8 octet: #20 at 1) + (reader error: invalid trailing UTF-8 octet: #20 at 1) + (reader error: invalid trailing UTF-8 octet: #20 at 1) + (reader error: invalid trailing UTF-8 octet: #20 at 1) + (reader error: invalid trailing UTF-8 octet: #20 at 1) + (reader error: invalid trailing UTF-8 octet: #20 at 1) + (reader error: invalid trailing UTF-8 octet: #20 at 1) + (reader error: invalid trailing UTF-8 octet: #20 at 1) + (reader error: invalid trailing UTF-8 octet: #20 at 1) + (reader error: invalid trailing UTF-8 octet: #20 at 1) + (reader error: invalid trailing UTF-8 octet: #20 at 1) + (reader error: invalid trailing UTF-8 octet: #20 at 1) + (reader error: invalid trailing UTF-8 octet: #20 at 1) + (reader error: invalid trailing UTF-8 octet: #20 at 1) + (reader error: invalid trailing UTF-8 octet: #20 at 1) + (reader error: invalid trailing UTF-8 octet: #20 at 1) + (reader error: invalid trailing UTF-8 octet: #20 at 1) + (reader error: invalid trailing UTF-8 octet: #20 at 1) + (reader error: invalid trailing UTF-8 octet: #20 at 1) 16 first bytes of 3-byte sequences {0xe0-0xef}: + (reader error: incomplete UTF-8 octet sequence at 0) + (reader error: incomplete UTF-8 octet sequence at 0) + (reader error: incomplete UTF-8 octet sequence at 0) + (reader error: incomplete UTF-8 octet sequence at 0) + (reader error: incomplete UTF-8 octet sequence at 0) + (reader error: incomplete UTF-8 octet sequence at 0) + (reader error: incomplete UTF-8 octet sequence at 0) + (reader error: incomplete UTF-8 octet sequence at 0) + (reader error: incomplete UTF-8 octet sequence at 0) + (reader error: incomplete UTF-8 octet sequence at 0) + (reader error: incomplete UTF-8 octet sequence at 0) + (reader error: incomplete UTF-8 octet sequence at 0) + (reader error: incomplete UTF-8 octet sequence at 0) + (reader error: incomplete UTF-8 octet sequence at 0) + (reader error: incomplete UTF-8 octet sequence at 0) + (reader error: incomplete UTF-8 octet sequence at 0) 8 first bytes of 4-byte sequences {0xf0-0xf7}: + (reader error: incomplete UTF-8 octet sequence at 0) + (reader error: incomplete UTF-8 octet sequence at 0) + (reader error: incomplete UTF-8 octet sequence at 0) + (reader error: incomplete UTF-8 octet sequence at 0) + (reader error: incomplete UTF-8 octet sequence at 0) + (reader error: incomplete UTF-8 octet sequence at 0) + (reader error: incomplete UTF-8 octet sequence at 0) + (reader error: incomplete UTF-8 octet sequence at 0) 4 first bytes of 5-byte sequences {0xf8-0xfb}: + (reader error: invalid leading UTF-8 octet: #F8 at 0) + (reader error: invalid leading UTF-8 octet: #F9 at 0) + (reader error: invalid leading UTF-8 octet: #FA at 0) + (reader error: invalid leading UTF-8 octet: #FB at 0) 2 first bytes of 6-byte sequences {0xfc-0xfd}: + (reader error: invalid leading UTF-8 octet: #FC at 0) + (reader error: invalid leading UTF-8 octet: #FD at 0) sequences with last byte missing {u-0}: + (reader error: incomplete UTF-8 octet sequence at 0) + (reader error: incomplete UTF-8 octet sequence at 0) + (reader error: incomplete UTF-8 octet sequence at 0) + (reader error: invalid leading UTF-8 octet: #F8 at 0) + (reader error: invalid leading UTF-8 octet: #FC at 0) sequences with last byte missing {u-...FF}: + (reader error: incomplete UTF-8 octet sequence at 0) + (reader error: incomplete UTF-8 octet sequence at 0) + (reader error: incomplete UTF-8 octet sequence at 0) + (reader error: invalid leading UTF-8 octet: #FB at 0) + (reader error: invalid leading UTF-8 octet: #FD at 0) impossible bytes: + (reader error: invalid leading UTF-8 octet: #FE at 0) + (reader error: invalid leading UTF-8 octet: #FF at 0) + (reader error: invalid leading UTF-8 octet: #FE at 0) overlong sequences {u-2f}: + (reader error: invalid length of a UTF-8 sequence at 0) + (reader error: invalid length of a UTF-8 sequence at 0) + (reader error: invalid length of a UTF-8 sequence at 0) + (reader error: invalid leading UTF-8 octet: #F8 at 0) + (reader error: invalid leading UTF-8 octet: #FC at 0) maximum overlong sequences: + (reader error: invalid length of a UTF-8 sequence at 0) + (reader error: invalid length of a UTF-8 sequence at 0) + (reader error: invalid length of a UTF-8 sequence at 0) + (reader error: invalid leading UTF-8 octet: #F8 at 0) + (reader error: invalid leading UTF-8 octet: #FC at 0) overlong representation of the NUL character: + (reader error: invalid length of a UTF-8 sequence at 0) + (reader error: invalid length of a UTF-8 sequence at 0) + (reader error: invalid length of a UTF-8 sequence at 0) + (reader error: invalid leading UTF-8 octet: #F8 at 0) + (reader error: invalid leading UTF-8 octet: #FC at 0) single UTF-16 surrogates: + (reader error: invalid Unicode character: #D800 at 0) + (reader error: invalid Unicode character: #DB7F at 0) + (reader error: invalid Unicode character: #DB80 at 0) + (reader error: invalid Unicode character: #DBFF at 0) + (reader error: invalid Unicode character: #DC00 at 0) + (reader error: invalid Unicode character: #DF80 at 0) + (reader error: invalid Unicode character: #DFFF at 0) paired UTF-16 surrogates: + (reader error: invalid Unicode character: #D800 at 0) + (reader error: invalid Unicode character: #D800 at 0) + (reader error: invalid Unicode character: #DB7F at 0) + (reader error: invalid Unicode character: #DB7F at 0) + (reader error: invalid Unicode character: #DB80 at 0) + (reader error: invalid Unicode character: #DB80 at 0) + (reader error: invalid Unicode character: #DBFF at 0) + (reader error: invalid Unicode character: #DBFF at 0) other illegal code positions: + (reader error: control characters are not allowed: #FFFE at 0) + (reader error: control characters are not allowed: #FFFF at 0) checking utf-8 sequences: 0 fail(s) checking boms... no bom (utf-8): + bom (utf-8): + bom (utf-16-le): + bom (utf-16-be): + checking boms: 0 fail(s) checking a long utf8 sequence... checking a long utf8 sequence: 0 fail(s) checking a long utf16 sequence... checking a long utf16 sequence: 0 fail(s) PASS: test-reader sizeof(token) = 80 sizeof(event) = 104 sizeof(parser) = 480 PASS: test-version DURATION: 0 END: /usr/lib/libyaml/ptest STOP: ptest-runner Signed-off-by: Pratik Farkase <[email protected]> Signed-off-by: Mathieu Dubois-Briand <[email protected]> Signed-off-by: Richard Purdie <[email protected]>

peterhurley-cisco added 2 commits December 12, 2022 17:30

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Fix externalsrc harder #83

Fix externalsrc harder #83

Uh oh!

peterhurley commented Dec 13, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Fix externalsrc harder #83

Are you sure you want to change the base?

Fix externalsrc harder #83

Uh oh!

Conversation

peterhurley commented Dec 13, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants