From eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 Mon Sep 17 00:00:00 2001 From: Dave Cobbley Date: Tue, 14 Aug 2018 10:05:37 -0700 Subject: [Subtree] Removing import-layers directory As part of the move to subtrees, need to bring all the import layers content to the top level. Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f Signed-off-by: Dave Cobbley Signed-off-by: Brad Bishop --- poky/meta/classes/packagedata.bbclass | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 poky/meta/classes/packagedata.bbclass (limited to 'poky/meta/classes/packagedata.bbclass') diff --git a/poky/meta/classes/packagedata.bbclass b/poky/meta/classes/packagedata.bbclass new file mode 100644 index 000000000..a903e5cfd --- /dev/null +++ b/poky/meta/classes/packagedata.bbclass @@ -0,0 +1,34 @@ +python read_subpackage_metadata () { + import oe.packagedata + + vars = { + "PN" : d.getVar('PN'), + "PE" : d.getVar('PE'), + "PV" : d.getVar('PV'), + "PR" : d.getVar('PR'), + } + + data = oe.packagedata.read_pkgdata(vars["PN"], d) + + for key in data.keys(): + d.setVar(key, data[key]) + + for pkg in d.getVar('PACKAGES').split(): + sdata = oe.packagedata.read_subpkgdata(pkg, d) + for key in sdata.keys(): + if key in vars: + if sdata[key] != vars[key]: + if 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." % (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 + # + # 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 v1.2.3