summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-03 17:03:14 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-14 14:32:29 +0000
commit0109a3623a19f9ae289952a4f054e53c3eca4eaa (patch)
tree6ee965c4c07659ec2c75290c5900c054bfe86f29
parent7a27f95c2800285d7f97fead616620bfd7dabbe3 (diff)
downloadopenembedded-core-0109a3623a19f9ae289952a4f054e53c3eca4eaa.tar.gz
openembedded-core-0109a3623a19f9ae289952a4f054e53c3eca4eaa.tar.bz2
openembedded-core-0109a3623a19f9ae289952a4f054e53c3eca4eaa.zip
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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/sstate.bbclass4
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):
def sstate_add(ss, source, dest, d):
srcbase = os.path.basename(source)
+ if not source.endswith:
+ source = source + "/"
+ if not dest.endswith:
+ dest = dest + "/"
ss['dirs'].append([srcbase, source, dest])
return ss