bitbake: Fix a couple of VAR_${PN} errors reported by ross
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@307 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
parent
8f696d3b9f
commit
78c5069d65
|
@ -77,10 +77,10 @@ class BBParsingStatus:
|
||||||
pr = bb.data.getVar('PR', bb_data, True)
|
pr = bb.data.getVar('PR', bb_data, True)
|
||||||
dp = int(bb.data.getVar('DEFAULT_PREFERENCE', bb_data, True) or "0")
|
dp = int(bb.data.getVar('DEFAULT_PREFERENCE', bb_data, True) or "0")
|
||||||
provides = Set([pn] + (bb.data.getVar("PROVIDES", bb_data, 1) or "").split())
|
provides = Set([pn] + (bb.data.getVar("PROVIDES", bb_data, 1) or "").split())
|
||||||
rprovides = (bb.data.getVar("RPROVIDES", bb_data, 1) or "").split()
|
|
||||||
depends = (bb.data.getVar("DEPENDS", bb_data, True) or "").split()
|
depends = (bb.data.getVar("DEPENDS", bb_data, True) or "").split()
|
||||||
packages = (bb.data.getVar('PACKAGES', bb_data, True) or "").split()
|
packages = (bb.data.getVar('PACKAGES', bb_data, True) or "").split()
|
||||||
packages_dynamic = (bb.data.getVar('PACKAGES_DYNAMIC', bb_data, True) or "").split()
|
packages_dynamic = (bb.data.getVar('PACKAGES_DYNAMIC', bb_data, True) or "").split()
|
||||||
|
rprovides = Set((bb.data.getVar("RPROVIDES_%s" % pn, bb_data, 1) or "").split() + (bb.data.getVar("RPROVIDES", bb_data, 1) or "").split())
|
||||||
|
|
||||||
|
|
||||||
# build PackageName to FileName lookup table
|
# build PackageName to FileName lookup table
|
||||||
|
@ -656,6 +656,7 @@ class BBCooker:
|
||||||
rdepends += bb.utils.explode_deps(bb.data.getVar('RDEPENDS', the_data, True) or "")
|
rdepends += bb.utils.explode_deps(bb.data.getVar('RDEPENDS', the_data, True) or "")
|
||||||
rdepends += bb.utils.explode_deps(bb.data.getVar('RRECOMMENDS', the_data, True) or "")
|
rdepends += bb.utils.explode_deps(bb.data.getVar('RRECOMMENDS', the_data, True) or "")
|
||||||
rdepends += bb.utils.explode_deps(bb.data.getVar("RDEPENDS_%s" % pn, the_data, True) or "")
|
rdepends += bb.utils.explode_deps(bb.data.getVar("RDEPENDS_%s" % pn, the_data, True) or "")
|
||||||
|
rdepends += bb.utils.explode_deps(bb.data.getVar('RRECOMMENDS_%s' % pn, the_data, True) or "")
|
||||||
else:
|
else:
|
||||||
packages = (bb.data.getVar('PACKAGES', the_data, 1).split() or "")
|
packages = (bb.data.getVar('PACKAGES', the_data, 1).split() or "")
|
||||||
for package in packages:
|
for package in packages:
|
||||||
|
|
Loading…
Reference in New Issue