diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-03 17:03:14 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-14 14:38:28 +0000 |
| commit | 19ecc264f87a0b94b2340fcb3521024f142dff68 (patch) | |
| tree | a7a13145698d5c7228d13dcbc0b2ad9e4a40b2c8 | |
| parent | 78ac027f2ac6c6663fff7080eabbd3d09c1241bb (diff) | |
| download | poky-19ecc264f87a0b94b2340fcb3521024f142dff68.tar.gz | |
sstate: Be consistent about sstate-inputdirs/outputdirs ending with '/'
The manifest file can become corrupted if sstate-inputdirs and sstate-outputdirs
don't have matching endings. This patch ensures that even if set incorrectly,
the code functions as intended, thereby handling manifest corruption safely.
(From OE-Core rev: 0109a3623a19f9ae289952a4f054e53c3eca4eaa)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/sstate.bbclass | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index cbb14e1177..2f31526828 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass | |||
| @@ -111,6 +111,10 @@ def sstate_state_fromvars(d, task = None): | |||
| 111 | 111 | ||
| 112 | def sstate_add(ss, source, dest, d): | 112 | def sstate_add(ss, source, dest, d): |
| 113 | srcbase = os.path.basename(source) | 113 | srcbase = os.path.basename(source) |
| 114 | if not source.endswith: | ||
| 115 | source = source + "/" | ||
| 116 | if not dest.endswith: | ||
| 117 | dest = dest + "/" | ||
| 114 | ss['dirs'].append([srcbase, source, dest]) | 118 | ss['dirs'].append([srcbase, source, dest]) |
| 115 | return ss | 119 | return ss |
| 116 | 120 | ||
