diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-03 17:01:32 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-14 14:38:28 +0000 |
| commit | 2c494b20909790a2bebc2e7e878c39a3dba92dc7 (patch) | |
| tree | 0fe09034041be037cc0f70ee9f92bac276aa31f6 /meta/recipes-core | |
| parent | 19ecc264f87a0b94b2340fcb3521024f142dff68 (diff) | |
| download | poky-2c494b20909790a2bebc2e7e878c39a3dba92dc7.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.
(From OE-Core rev: 3910eaf88d14904eef85b9e391387547df7fc54e)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | meta/recipes-core/eglibc/eglibc-initial.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-core/uclibc/uclibc-initial_0.9.33.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-core/uclibc/uclibc-initial_git.bb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-initial.inc b/meta/recipes-core/eglibc/eglibc-initial.inc index c1a090e39e..83b1d2cecf 100644 --- a/meta/recipes-core/eglibc/eglibc-initial.inc +++ b/meta/recipes-core/eglibc/eglibc-initial.inc | |||
| @@ -72,7 +72,7 @@ eglibcinitial_sstate_postinst() { | |||
| 72 | fi | 72 | fi |
| 73 | } | 73 | } |
| 74 | 74 | ||
| 75 | do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_TCBOOTSTRAP}" | 75 | do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_TCBOOTSTRAP}/" |
| 76 | 76 | ||
| 77 | # We don't install any scripts so there is nothing to evacuate | 77 | # We don't install any scripts so there is nothing to evacuate |
| 78 | do_evacuate_scripts () { | 78 | 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 22f56de1c2..4620c96bb0 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 () { | |||
| 33 | : | 33 | : |
| 34 | } | 34 | } |
| 35 | 35 | ||
| 36 | do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_TCBOOTSTRAP}" | 36 | 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 c0b7d52f60..9e3edbddb3 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 () { | |||
| 33 | : | 33 | : |
| 34 | } | 34 | } |
| 35 | 35 | ||
| 36 | do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_TCBOOTSTRAP}" | 36 | do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_TCBOOTSTRAP}/" |
