Skip to content

data_smart: fix key expansion in conditional overrides

Nguyen Minh Tien bitbake-devel 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest1 patch 4 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/1data_smart: fix operations lost when an override name contains a variablelib/bb/data_smart.py lib/bb/tests/data.py+34 -24 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 0/1] data_smart: fix key expansion in conditional overrides

An :append whose override name still contains a variable is silently dropped. From the report:

    RDEPENDS:${PN}:append:pn-packagegroup-cross-canadian-${MACHINE} = " ..."

Still reproduces on master (c251833d2). The mechanism is in the patch; briefly, renameVar() rebuilds dependent override keys with a string replace, so renaming RDEPENDS:${PN} leaves the ${MACHINE} behind and the append lands on a key no override can ever match.

The part worth flagging is the '${' not in newkey guard. Expanding unconditionally looks like the obvious fix but regresses parsing:
native.bbclass renames to a key that is itself still unexpanded, before expandKeys() runs, and expanding the dependent keys there turns the later rename into a no-op. oe-core then parses with three warnings master does not have, in dbus and python3-psutil. The second of the two added tests covers this and fails without the guard.

Tested against bitbake c251833d2 and oe-core 9d89b3b802:

- bitbake-selftest: 790 tests, no failures. Six bb.tests.fetch errors remain, host issues that occur identically on master
- all 952 oe-core recipes parse with no warnings, same as master
- bitbake -e for dbus-native and python3-psutil-native, the two recipes that hit this path, identical to master
- same parse with multilib enabled, exercising multilib_global.bbclass
- core-image-minimal builds for qemux86-64, 5275 tasks

Nguyen Minh Tien (1):
data_smart: fix operations lost when an override name contains a
variable

 lib/bb/data_smart.py | 11 +++++++++--
 lib/bb/tests/data.py | 25 +++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)
Signature · 1 line
2.34.1