From 7f0f1179eb02c3bb84ffe01f102375dc1186136e Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 4 Aug 2021 10:55:04 +0100 Subject: bitbake: fetch/tests/toaster: Override conversion fixups Fix some references that missed during the overrides syntax migration or were incorrect. Thanks to Quentin Schulz for the patch. (Bitbake rev: 6184cb07dfa44f5f76f1c423533b4547d80b20ab) Signed-off-by: Richard Purdie --- bitbake/lib/bb/fetch2/__init__.py | 2 +- bitbake/lib/bb/tests/parse.py | 2 +- bitbake/lib/bb/utils.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'bitbake/lib/bb') diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index 60aaf3902a..ad898680ff 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py @@ -1146,7 +1146,7 @@ def srcrev_internal_helper(ud, d, name): pn = d.getVar("PN") attempts = [] if name != '' and pn: - attempts.append("SRCREV_%s_pn-%s" % (name, pn)) + attempts.append("SRCREV_%s:pn-%s" % (name, pn)) if name != '': attempts.append("SRCREV_%s" % name) if pn: diff --git a/bitbake/lib/bb/tests/parse.py b/bitbake/lib/bb/tests/parse.py index 1b6b6d412e..4d17f82edc 100644 --- a/bitbake/lib/bb/tests/parse.py +++ b/bitbake/lib/bb/tests/parse.py @@ -99,7 +99,7 @@ exportD = "d" overridetest = """ RRECOMMENDS:${PN} = "a" -RRECOMMENDS:${PN}_libc = "b" +RRECOMMENDS:${PN}:libc = "b" OVERRIDES = "libc:${PN}" PN = "gtk+" """ diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py index 6ba1d2a376..e6e82d1118 100644 --- a/bitbake/lib/bb/utils.py +++ b/bitbake/lib/bb/utils.py @@ -1178,7 +1178,7 @@ def edit_metadata(meta_lines, variables, varfunc, match_overrides=False): variables: a list of variable names to look for. Functions may also be specified, but must be specified with '()' at the end of the name. Note that the function doesn't have - any intrinsic understanding of _append, _prepend, _remove, + any intrinsic understanding of :append, :prepend, :remove, or overrides, so these are considered as part of the name. These values go into a regular expression, so regular expression syntax is allowed. -- cgit v1.2.3-54-g00ecf