diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-16 13:49:59 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-21 23:37:27 +0000 |
commit | 98b3ed1b2e113bdd028dcf22477892ea8cfe007b (patch) | |
tree | 9311d25a78b62db866892345fce92f71b3b875b3 /meta/classes/staging.bbclass | |
parent | 492214104a55ec56cc483c9b045038e355c6af7b (diff) | |
download | poky-98b3ed1b2e113bdd028dcf22477892ea8cfe007b.tar.gz |
meta/scripts: Handle bitbake variable renaming
After other variables were renamed in bitbake, update OE-Core to match.
(From OE-Core rev: 91812ba5a34598e03ad860745707c7cba1ae5d91)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/staging.bbclass')
-rw-r--r-- | meta/classes/staging.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index 71302b6e12..574700260f 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass | |||
@@ -104,7 +104,7 @@ python do_populate_sysroot () { | |||
104 | for f in (d.getVar('SYSROOT_PREPROCESS_FUNCS') or '').split(): | 104 | for f in (d.getVar('SYSROOT_PREPROCESS_FUNCS') or '').split(): |
105 | bb.build.exec_func(f, d) | 105 | bb.build.exec_func(f, d) |
106 | pn = d.getVar("PN") | 106 | pn = d.getVar("PN") |
107 | multiprov = d.getVar("MULTI_PROVIDER_WHITELIST").split() | 107 | multiprov = d.getVar("BB_MULTI_PROVIDER_ALLOWED").split() |
108 | provdir = d.expand("${SYSROOT_DESTDIR}${base_prefix}/sysroot-providers/") | 108 | provdir = d.expand("${SYSROOT_DESTDIR}${base_prefix}/sysroot-providers/") |
109 | bb.utils.mkdirhier(provdir) | 109 | bb.utils.mkdirhier(provdir) |
110 | for p in d.getVar("PROVIDES").split(): | 110 | for p in d.getVar("PROVIDES").split(): |
@@ -116,7 +116,7 @@ python do_populate_sysroot () { | |||
116 | } | 116 | } |
117 | 117 | ||
118 | do_populate_sysroot[vardeps] += "${SYSROOT_PREPROCESS_FUNCS}" | 118 | do_populate_sysroot[vardeps] += "${SYSROOT_PREPROCESS_FUNCS}" |
119 | do_populate_sysroot[vardepsexclude] += "MULTI_PROVIDER_WHITELIST" | 119 | do_populate_sysroot[vardepsexclude] += "BB_MULTI_PROVIDER_ALLOWED" |
120 | 120 | ||
121 | POPULATESYSROOTDEPS = "" | 121 | POPULATESYSROOTDEPS = "" |
122 | POPULATESYSROOTDEPS:class-target = "virtual/${MLPREFIX}${TARGET_PREFIX}binutils:do_populate_sysroot" | 122 | POPULATESYSROOTDEPS:class-target = "virtual/${MLPREFIX}${TARGET_PREFIX}binutils:do_populate_sysroot" |