diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2017-05-03 23:13:38 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-05-11 16:55:59 +0100 |
commit | 439bb8cc711799b45a7f14dc8bcb1d524d993ab2 (patch) | |
tree | bc32469f2430d7ba41aedaba6124956fcd3e4062 /meta/classes | |
parent | 3e655f9c7f0f4f778dc9eedd9f7405fc84b4c9ad (diff) | |
download | poky-439bb8cc711799b45a7f14dc8bcb1d524d993ab2.tar.gz |
bitbake.conf: Add COMPONENTS_DIR for ${STAGING_DIR}-components
The path to where to install and find the sysroot components is used
in many places. This warrants it to get its own variable.
(From OE-Core rev: 70a84b525470f72339568409daf84845904e4cab)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/native.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/staging.bbclass | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass index aec1087af5..b8f839a8b2 100644 --- a/meta/classes/native.bbclass +++ b/meta/classes/native.bbclass | |||
@@ -95,7 +95,7 @@ libdir .= "${NATIVE_PACKAGE_PATH_SUFFIX}" | |||
95 | libexecdir .= "${NATIVE_PACKAGE_PATH_SUFFIX}" | 95 | libexecdir .= "${NATIVE_PACKAGE_PATH_SUFFIX}" |
96 | 96 | ||
97 | do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_NATIVE}/" | 97 | do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_NATIVE}/" |
98 | do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR}-components/${PACKAGE_ARCH}/${PN}" | 98 | do_populate_sysroot[sstate-outputdirs] = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/${PN}" |
99 | 99 | ||
100 | # Since we actually install these into situ there is no staging prefix | 100 | # Since we actually install these into situ there is no staging prefix |
101 | STAGING_DIR_HOST = "" | 101 | STAGING_DIR_HOST = "" |
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index 4015dd754c..31cd625640 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass | |||
@@ -201,8 +201,8 @@ do_populate_sysroot[depends] += "${POPULATESYSROOTDEPS}" | |||
201 | SSTATETASKS += "do_populate_sysroot" | 201 | SSTATETASKS += "do_populate_sysroot" |
202 | do_populate_sysroot[cleandirs] = "${SYSROOT_DESTDIR}" | 202 | do_populate_sysroot[cleandirs] = "${SYSROOT_DESTDIR}" |
203 | do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}" | 203 | do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}" |
204 | do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR}-components/${PACKAGE_ARCH}/${PN}" | 204 | do_populate_sysroot[sstate-outputdirs] = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/${PN}" |
205 | do_populate_sysroot[sstate-fixmedir] = "${STAGING_DIR}-components/${PACKAGE_ARCH}/${PN}" | 205 | do_populate_sysroot[sstate-fixmedir] = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/${PN}" |
206 | 206 | ||
207 | python do_populate_sysroot_setscene () { | 207 | python do_populate_sysroot_setscene () { |
208 | sstate_setscene(d) | 208 | sstate_setscene(d) |
@@ -442,7 +442,7 @@ python extend_recipe_sysroot() { | |||
442 | bb.note("\n".join(msgbuf)) | 442 | bb.note("\n".join(msgbuf)) |
443 | 443 | ||
444 | stagingdir = d.getVar("STAGING_DIR") | 444 | stagingdir = d.getVar("STAGING_DIR") |
445 | sharedmanifests = stagingdir + "-components/manifests" | 445 | sharedmanifests = d.getVar("COMPONENTS_DIR") + "/manifests" |
446 | recipesysroot = d.getVar("RECIPE_SYSROOT") | 446 | recipesysroot = d.getVar("RECIPE_SYSROOT") |
447 | recipesysrootnative = d.getVar("RECIPE_SYSROOT_NATIVE") | 447 | recipesysrootnative = d.getVar("RECIPE_SYSROOT_NATIVE") |
448 | current_variant = d.getVar("BBEXTENDVARIANT") | 448 | current_variant = d.getVar("BBEXTENDVARIANT") |