From 45b368427accf6d519078812d5335ec250bacef8 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 11 Jun 2015 23:06:56 +0100 Subject: packagedata: Fix to ensure variables expand correctly If we set unsuffixed variables here there is a chance they could clobber override versions of that variable, e.g. DESCRIPTION could clobber DESCRIPTION_. We therefore don't clobber for the unsuffixed variable versions by using the parsing flag to setVar. This becomes a problem with the modifications to bitbake to have continual expansion of the datastore, its about the one place this turns out to be problematic. The parameter to setVar works with current bitbake even though we don't have the new API since it gets swallowed by the logging code. Signed-off-by: Richard Purdie --- meta/classes/packagedata.bbclass | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'meta/classes/packagedata.bbclass') diff --git a/meta/classes/packagedata.bbclass b/meta/classes/packagedata.bbclass index d1aedf2289..3397f1e36b 100644 --- a/meta/classes/packagedata.bbclass +++ b/meta/classes/packagedata.bbclass @@ -22,5 +22,13 @@ python read_subpackage_metadata () { bb.fatal("Recipe %s is trying to create package %s which was already written by recipe %s. This will cause corruption, please resolve this and only provide the package from one recipe or the other or only build one of the recipes." % (vars[key], pkg, sdata[key])) bb.fatal("Recipe %s is trying to change %s from '%s' to '%s'. This will cause do_package_write_* failures since the incorrect data will be used and they will be unable to find the right workdir." % (vars["PN"], key, vars[key], sdata[key])) continue - d.setVar(key, sdata[key]) + # + # If we set unsuffixed variables here there is a chance they could clobber override versions + # of that variable, e.g. DESCRIPTION could clobber DESCRIPTION_ + # We therefore don't clobber for the unsuffixed variable versions + # + if key.endswith("_" + pkg): + d.setVar(key, sdata[key]) + else: + d.setVar(key, sdata[key], parsing=True) } -- cgit 1.2.3-korg