From 2c494b20909790a2bebc2e7e878c39a3dba92dc7 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 3 Nov 2012 17:01:32 +0000 Subject: 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. (From OE-Core rev: 3910eaf88d14904eef85b9e391387547df7fc54e) Signed-off-by: Richard Purdie --- meta/classes/cross.bbclass | 2 +- meta/classes/native.bbclass | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/classes') 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 = "" -- cgit v1.2.3-54-g00ecf