diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-04 10:55:04 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-06 06:34:45 +0100 |
| commit | 6184cb07dfa44f5f76f1c423533b4547d80b20ab (patch) | |
| tree | 44e757b573c84f525b2a8e6cea49b2d5c915b586 /lib | |
| parent | 2fd03ec7b136c694f2ced43b3abb69f719c99ec2 (diff) | |
| download | bitbake-6184cb07dfa44f5f76f1c423533b4547d80b20ab.tar.gz | |
fetch/tests/toaster: Override conversion fixups
Fix some references that missed during the overrides syntax migration or
were incorrect. Thanks to Quentin Schulz <foss@0leil.net> for the patch.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bb/fetch2/__init__.py | 2 | ||||
| -rw-r--r-- | lib/bb/tests/parse.py | 2 | ||||
| -rw-r--r-- | lib/bb/utils.py | 2 | ||||
| -rw-r--r-- | lib/toaster/toastergui/views.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index 60aaf3902..ad898680f 100644 --- a/lib/bb/fetch2/__init__.py +++ b/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/lib/bb/tests/parse.py b/lib/bb/tests/parse.py index 1b6b6d412..4d17f82ed 100644 --- a/lib/bb/tests/parse.py +++ b/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/lib/bb/utils.py b/lib/bb/utils.py index 6ba1d2a37..e6e82d111 100644 --- a/lib/bb/utils.py +++ b/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. diff --git a/lib/toaster/toastergui/views.py b/lib/toaster/toastergui/views.py index 04ab8bcb0..74f9d5696 100644 --- a/lib/toaster/toastergui/views.py +++ b/lib/toaster/toastergui/views.py @@ -1840,7 +1840,7 @@ if True: pass try: context['image_install:append'] = ProjectVariable.objects.get(project = prj, name = "IMAGE_INSTALL:append").value - context['image_install:append_defined'] = "1" + context['image_install_append_defined'] = "1" except ProjectVariable.DoesNotExist: pass try: |