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 <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
19ecc264f8
commit
2c494b2090
|
@ -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):
|
||||
|
|
|
@ -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 = ""
|
||||
|
|
|
@ -72,7 +72,7 @@ eglibcinitial_sstate_postinst() {
|
|||
fi
|
||||
}
|
||||
|
||||
do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_TCBOOTSTRAP}"
|
||||
do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_TCBOOTSTRAP}/"
|
||||
|
||||
# We don't install any scripts so there is nothing to evacuate
|
||||
do_evacuate_scripts () {
|
||||
|
|
|
@ -33,4 +33,4 @@ do_siteconfig () {
|
|||
:
|
||||
}
|
||||
|
||||
do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_TCBOOTSTRAP}"
|
||||
do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_TCBOOTSTRAP}/"
|
||||
|
|
|
@ -33,4 +33,4 @@ do_siteconfig () {
|
|||
:
|
||||
}
|
||||
|
||||
do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_TCBOOTSTRAP}"
|
||||
do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_TCBOOTSTRAP}/"
|
||||
|
|
|
@ -74,6 +74,6 @@ sysroot_stage_all() {
|
|||
mv ${SYSROOT_DESTDIR}${target_libdir}/* ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_libdir}/ || true
|
||||
}
|
||||
|
||||
do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_HOST} ${SYSROOT_DESTDIR}/${STAGING_DIR_TARGET}/${target_base_libdir}"
|
||||
do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_HOST} ${STAGING_DIR_TCBOOTSTRAP}/${target_base_libdir}"
|
||||
do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_HOST}/ ${SYSROOT_DESTDIR}/${STAGING_DIR_TARGET}/${target_base_libdir}/"
|
||||
do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_HOST}/ ${STAGING_DIR_TCBOOTSTRAP}/${target_base_libdir}/"
|
||||
|
||||
|
|
Loading…
Reference in New Issue