diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-03 17:01:32 +0000 |
|---|---|---|
| committer |   Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2012-11-29 12:00:32 +0100 |
| commit | 21a82a3b33649e12981808791d33b2c74c1bb434 (patch) | |
| tree | 294c77c8eaa77b80eece27f89306c4eeedd4c04b /meta/classes | |
| parent | 4cd831f1d893758b4794126b3b6cf6d1f878a945 (diff) | |
| download | openembedded-core-contrib-21a82a3b33649e12981808791d33b2c74c1bb434.tar.gz | |
classes: Be consistent about sstate-inputdirs/outputdirs ending with '/'
If sstate-inputdirs and sstate-outputdirs don't match with ending '/'
characters, the manifest file can end up corrupted. This change
ensures the metadata is consistent in ending do_populate_root tasks
with this character to avoid manifest file corruption.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/cross.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/native.bbclass | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass index 735f6d263f..b57e523465 100644 --- a/meta/classes/cross.bbclass +++ b/meta/classes/cross.bbclass @@ -54,7 +54,7 @@ base_sbindir = "${bindir}" libdir = "${exec_prefix}/lib/${CROSS_TARGET_SYS_DIR}" libexecdir = "${exec_prefix}/libexec/${CROSS_TARGET_SYS_DIR}" -do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_NATIVE}" +do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_NATIVE}/" python cross_virtclass_handler () { if not isinstance(e, bb.event.RecipePreFinalise): diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass index 6314ba1b1d..1462ffb6d4 100644 --- a/meta/classes/native.bbclass +++ b/meta/classes/native.bbclass @@ -82,8 +82,8 @@ bindir .= "${NATIVE_PACKAGE_PATH_SUFFIX}" libdir .= "${NATIVE_PACKAGE_PATH_SUFFIX}" libexecdir .= "${NATIVE_PACKAGE_PATH_SUFFIX}" -do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_NATIVE}" -do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_NATIVE}" +do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_NATIVE}/" +do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_NATIVE}/" # Since we actually install these into situ there is no staging prefix STAGING_DIR_HOST = "" |