diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/classes/staging.bbclass | |
parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
download | poky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz |
Convert to new override syntax
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/staging.bbclass')
-rw-r--r-- | meta/classes/staging.bbclass | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index 32a615c743..af3397bab6 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass | |||
@@ -19,9 +19,9 @@ SYSROOT_DIRS_NATIVE = " \ | |||
19 | ${sysconfdir} \ | 19 | ${sysconfdir} \ |
20 | ${localstatedir} \ | 20 | ${localstatedir} \ |
21 | " | 21 | " |
22 | SYSROOT_DIRS_append_class-native = " ${SYSROOT_DIRS_NATIVE}" | 22 | SYSROOT_DIRS:append:class-native = " ${SYSROOT_DIRS_NATIVE}" |
23 | SYSROOT_DIRS_append_class-cross = " ${SYSROOT_DIRS_NATIVE}" | 23 | SYSROOT_DIRS:append:class-cross = " ${SYSROOT_DIRS_NATIVE}" |
24 | SYSROOT_DIRS_append_class-crosssdk = " ${SYSROOT_DIRS_NATIVE}" | 24 | SYSROOT_DIRS:append:class-crosssdk = " ${SYSROOT_DIRS_NATIVE}" |
25 | 25 | ||
26 | # These directories will not be staged in the sysroot | 26 | # These directories will not be staged in the sysroot |
27 | SYSROOT_DIRS_BLACKLIST = " \ | 27 | SYSROOT_DIRS_BLACKLIST = " \ |
@@ -82,7 +82,7 @@ python sysroot_strip () { | |||
82 | pn = d.getVar('PN') | 82 | pn = d.getVar('PN') |
83 | libdir = d.getVar("libdir") | 83 | libdir = d.getVar("libdir") |
84 | base_libdir = d.getVar("base_libdir") | 84 | base_libdir = d.getVar("base_libdir") |
85 | qa_already_stripped = 'already-stripped' in (d.getVar('INSANE_SKIP_' + pn) or "").split() | 85 | qa_already_stripped = 'already-stripped' in (d.getVar('INSANE_SKIP:' + pn) or "").split() |
86 | strip_cmd = d.getVar("STRIP") | 86 | strip_cmd = d.getVar("STRIP") |
87 | 87 | ||
88 | oe.package.strip_execs(pn, dstdir, strip_cmd, libdir, base_libdir, d, | 88 | oe.package.strip_execs(pn, dstdir, strip_cmd, libdir, base_libdir, d, |
@@ -118,8 +118,8 @@ do_populate_sysroot[vardeps] += "${SYSROOT_PREPROCESS_FUNCS}" | |||
118 | do_populate_sysroot[vardepsexclude] += "MULTI_PROVIDER_WHITELIST" | 118 | do_populate_sysroot[vardepsexclude] += "MULTI_PROVIDER_WHITELIST" |
119 | 119 | ||
120 | POPULATESYSROOTDEPS = "" | 120 | POPULATESYSROOTDEPS = "" |
121 | POPULATESYSROOTDEPS_class-target = "virtual/${MLPREFIX}${TARGET_PREFIX}binutils:do_populate_sysroot" | 121 | POPULATESYSROOTDEPS:class-target = "virtual/${MLPREFIX}${TARGET_PREFIX}binutils:do_populate_sysroot" |
122 | POPULATESYSROOTDEPS_class-nativesdk = "virtual/${TARGET_PREFIX}binutils-crosssdk:do_populate_sysroot" | 122 | POPULATESYSROOTDEPS:class-nativesdk = "virtual/${TARGET_PREFIX}binutils-crosssdk:do_populate_sysroot" |
123 | do_populate_sysroot[depends] += "${POPULATESYSROOTDEPS}" | 123 | do_populate_sysroot[depends] += "${POPULATESYSROOTDEPS}" |
124 | 124 | ||
125 | SSTATETASKS += "do_populate_sysroot" | 125 | SSTATETASKS += "do_populate_sysroot" |