[OE-core] [PATCH] classes: Be consistent about sstate-inputdirs/outputdirs ending with '/'
Martin Jansa
martin.jansa at gmail.com
Wed Nov 14 15:09:45 UTC 2012
On Tue, Nov 13, 2012 at 02:05:00PM +0000, Richard Purdie wrote:
> 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 at linuxfoundation.org>
> ---
> diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass
> index 735f6d2..b57e523 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 6314ba1..1462ffb 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 = ""
> diff --git a/meta/recipes-core/eglibc/eglibc-initial.inc b/meta/recipes-core/eglibc/eglibc-initial.inc
> index c1a090e..83b1d2c 100644
> --- a/meta/recipes-core/eglibc/eglibc-initial.inc
> +++ b/meta/recipes-core/eglibc/eglibc-initial.inc
> @@ -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 () {
> diff --git a/meta/recipes-core/uclibc/uclibc-initial_0.9.33.bb b/meta/recipes-core/uclibc/uclibc-initial_0.9.33.bb
> index 22f56de..4620c96 100644
> --- a/meta/recipes-core/uclibc/uclibc-initial_0.9.33.bb
> +++ b/meta/recipes-core/uclibc/uclibc-initial_0.9.33.bb
> @@ -33,4 +33,4 @@ do_siteconfig () {
> :
> }
>
> -do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_TCBOOTSTRAP}"
> +do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_TCBOOTSTRAP}/"
> diff --git a/meta/recipes-core/uclibc/uclibc-initial_git.bb b/meta/recipes-core/uclibc/uclibc-initial_git.bb
> index c0b7d52..9e3edbd 100644
> --- a/meta/recipes-core/uclibc/uclibc-initial_git.bb
> +++ b/meta/recipes-core/uclibc/uclibc-initial_git.bb
> @@ -33,4 +33,4 @@ do_siteconfig () {
> :
> }
>
> -do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_TCBOOTSTRAP}"
> +do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_TCBOOTSTRAP}/"
> diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial.inc b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
> index ff6556c..1ac1db6 100644
> --- a/meta/recipes-devtools/gcc/gcc-cross-initial.inc
> +++ b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
> @@ -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}/"
Not sure if it can be caused by this, but building from scratch fails
today with:
NOTE: Running setscene task 430 of 457 (/OE/oe-core/openembedded-core/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.3.bb, do_populate_sysroot_setscene)
ERROR: Error executing a python function in /OE/oe-core/openembedded-core/meta/recipes-devtools/gcc/gcc-cross-initial_4.7.bb:
OSError: [Errno 2] No such file or directory
ERROR: The stack trace of python calls that resulted in this exception/failure was:
ERROR: File "do_populate_sysroot_setscene", line 6, in <module>
ERROR:
ERROR: File "do_populate_sysroot_setscene", line 3, in do_populate_sysroot_setscene
ERROR:
ERROR: File "sstate.bbclass", line 3, in sstate_setscene
ERROR:
ERROR: File "sstate.bbclass", line 63, in sstate_installpkg
ERROR:
ERROR: The code that was being executed was:
ERROR: 0002:def do_populate_sysroot_setscene(d):
ERROR: 0003: sstate_setscene(d)
ERROR: 0004:
ERROR: 0005:
ERROR: *** 0006:do_populate_sysroot_setscene(d)
ERROR: 0007:
ERROR: [From file: 'do_populate_sysroot_setscene', lineno: 6, function: <module>]
ERROR: 0001:
ERROR: 0002:def do_populate_sysroot_setscene(d):
ERROR: *** 0003: sstate_setscene(d)
ERROR: 0004:
ERROR: 0005:
ERROR: 0006:do_populate_sysroot_setscene(d)
ERROR: 0007:
ERROR: [From file: 'do_populate_sysroot_setscene', lineno: 3, function: do_populate_sysroot_setscene]
ERROR: 0001:def sstate_setscene(d):
ERROR: 0002: shared_state = sstate_state_fromvars(d)
ERROR: *** 0003: accelerate = sstate_installpkg(shared_state, d)
ERROR: 0004: if not accelerate:
ERROR: 0005: raise bb.build.FuncFailed("No suitable staging package found")
ERROR: 0006:
ERROR: [From file: 'sstate.bbclass', lineno: 3, function: sstate_setscene]
ERROR: 0059: os.remove(fixmefn)
ERROR: 0060:
ERROR: 0061: for state in ss['dirs']:
ERROR: 0062: prepdir(state[1])
ERROR: *** 0063: os.rename(sstateinst + state[0], state[1])
ERROR: 0064: sstate_install(ss, d)
ERROR: 0065:
ERROR: 0066: for plain in ss['plaindirs']:
ERROR: 0067: workdir = d.getVar('WORKDIR', True)
ERROR: [From file: 'sstate.bbclass', lineno: 63, function: sstate_installpkg]
NOTE: recipe gcc-cross-initial-4.7.2-r13: task do_populate_sysroot_setscene: Failed
WARNING: Setscene task 92 (/OE/oe-core/openembedded-core/meta/recipes-devtools/gcc/gcc-cross-initial_4.7.bb, do_populate_sysroot_setscene) failed with exit co
de '1' - real task will be run instead
It's not fatal, but it wasn't there yesterday AFAIK.
Cheers,
--
Martin 'JaMa' Jansa jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20121114/0069c750/attachment-0002.sig>
More information about the Openembedded-core
mailing list