From 8e8648b26fd4d66db2d7c484ad56dfb300e2070a Mon Sep 17 00:00:00 2001 From: Mei Lei Date: Mon, 20 Jun 2011 17:29:36 +0800 Subject: distrodata.bbclass: Get the extend recipe's information from non bbextended recipe This patch will check whether the recipe is an extened recipe, if yes, some informaiton couldn't be got, so collect those information(like maintainer information or lastcheckversion) from non bbextended recipe. Signed-off-by: Mei Lei --- meta/classes/distrodata.bbclass | 46 +++++++++++++++++++++++++++++------------ 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass index f24cff8dc..e91200d91 100644 --- a/meta/classes/distrodata.bbclass +++ b/meta/classes/distrodata.bbclass @@ -215,6 +215,7 @@ python checkpkg_eventhandler() { addtask checkpkg do_checkpkg[nostamp] = "1" python do_checkpkg() { + localdata = bb.data.createCopy(d) import sys import re import tempfile @@ -435,18 +436,38 @@ python do_checkpkg() { """generate package information from .bb file""" pname = bb.data.getVar('PN', d, True) - pdesc = bb.data.getVar('DESCRIPTION', d, True) - pgrp = bb.data.getVar('SECTION', d, True) - pversion = bb.data.getVar('PV', d, True) - plicense = bb.data.getVar('LICENSE', d, True) - psection = bb.data.getVar('SECTION', d, True) - phome = bb.data.getVar('HOMEPAGE', d, True) - prelease = bb.data.getVar('PR', d, True) - ppriority = bb.data.getVar('PRIORITY', d, True) - pdepends = bb.data.getVar('DEPENDS', d, True) - pbugtracker = bb.data.getVar('BUGTRACKER', d, True) - ppe = bb.data.getVar('PE', d, True) - psrcuri = bb.data.getVar('SRC_URI', d, True) + + if pname.find("-native") != -1: + pnstripped = pname.split("-native") + bb.note("Native Split: %s" % pnstripped) + bb.data.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + bb.data.getVar('OVERRIDES', d, True), localdata) + bb.data.update_data(localdata) + + if pname.find("-cross") != -1: + pnstripped = pname.split("-cross") + bb.note("cross Split: %s" % pnstripped) + bb.data.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + bb.data.getVar('OVERRIDES', d, True), localdata) + bb.data.update_data(localdata) + + if pname.find("-initial") != -1: + pnstripped = pname.split("-initial") + bb.note("initial Split: %s" % pnstripped) + bb.data.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + bb.data.getVar('OVERRIDES', d, True), localdata) + bb.data.update_data(localdata) + + pdesc = bb.data.getVar('DESCRIPTION', localdata, True) + pgrp = bb.data.getVar('SECTION', localdata, True) + pversion = bb.data.getVar('PV', localdata, True) + plicense = bb.data.getVar('LICENSE', localdata, True) + psection = bb.data.getVar('SECTION', localdata, True) + phome = bb.data.getVar('HOMEPAGE', localdata, True) + prelease = bb.data.getVar('PR', localdata, True) + ppriority = bb.data.getVar('PRIORITY', localdata, True) + pdepends = bb.data.getVar('DEPENDS', localdata, True) + pbugtracker = bb.data.getVar('BUGTRACKER', localdata, True) + ppe = bb.data.getVar('PE', localdata, True) + psrcuri = bb.data.getVar('SRC_URI', localdata, True) + maintainer = bb.data.getVar('RECIPE_MAINTAINER', localdata, True) found = 0 for uri in src_uri.split(): @@ -616,7 +637,6 @@ python do_checkpkg() { else: pmstatus = "UPDATE" - maintainer = bb.data.getVar('RECIPE_MAINTAINER', d, True) psrcuri = psrcuri.split()[0] pdepends = "".join(pdepends.split("\t")) pdesc = "".join(pdesc.split("\t")) -- cgit v1.2.3