aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/packagedata.bbclass7
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/classes/packagedata.bbclass b/meta/classes/packagedata.bbclass
index 790d874c1c..120cd6445f 100644
--- a/meta/classes/packagedata.bbclass
+++ b/meta/classes/packagedata.bbclass
@@ -1,7 +1,8 @@
python read_subpackage_metadata () {
import oe.packagedata
- data = oe.packagedata.read_pkgdata(d.getVar('PN', True), d)
+ pn = d.getVar('PN', True)
+ data = oe.packagedata.read_pkgdata(pn, d)
for key in data.keys():
d.setVar(key, data[key])
@@ -9,5 +10,9 @@ python read_subpackage_metadata () {
for pkg in d.getVar('PACKAGES', True).split():
sdata = oe.packagedata.read_subpkgdata(pkg, d)
for key in sdata.keys():
+ if key == "PN":
+ if sdata[key] != pn:
+ 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." % (pn, pkg, sdata[key]))
+ continue
d.setVar(key, sdata[key])
}