summaryrefslogtreecommitdiffstats
path: root/bitbake/bin
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-03-20 15:03:30 +0000
committerRichard Purdie <richard@openedhand.com>2006-03-20 15:03:30 +0000
commit78c5069d658152181870174362d90f6bf9ef59d7 (patch)
treef9103958017b944bc4298c2b1b7745bfc7204ada /bitbake/bin
parent8f696d3b9f9776b897a6821dc399ef8308a78645 (diff)
downloadpoky-78c5069d658152181870174362d90f6bf9ef59d7.tar.gz
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
Diffstat (limited to 'bitbake/bin')
-rwxr-xr-xbitbake/bin/bitbake3
1 files changed, 2 insertions, 1 deletions
diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake
index f371bfe165..63bd07fe34 100755
--- a/bitbake/bin/bitbake
+++ b/bitbake/bin/bitbake
@@ -77,10 +77,10 @@ class BBParsingStatus:
77 pr = bb.data.getVar('PR', bb_data, True) 77 pr = bb.data.getVar('PR', bb_data, True)
78 dp = int(bb.data.getVar('DEFAULT_PREFERENCE', bb_data, True) or "0") 78 dp = int(bb.data.getVar('DEFAULT_PREFERENCE', bb_data, True) or "0")
79 provides = Set([pn] + (bb.data.getVar("PROVIDES", bb_data, 1) or "").split()) 79 provides = Set([pn] + (bb.data.getVar("PROVIDES", bb_data, 1) or "").split())
80 rprovides = (bb.data.getVar("RPROVIDES", bb_data, 1) or "").split()
81 depends = (bb.data.getVar("DEPENDS", bb_data, True) or "").split() 80 depends = (bb.data.getVar("DEPENDS", bb_data, True) or "").split()
82 packages = (bb.data.getVar('PACKAGES', bb_data, True) or "").split() 81 packages = (bb.data.getVar('PACKAGES', bb_data, True) or "").split()
83 packages_dynamic = (bb.data.getVar('PACKAGES_DYNAMIC', bb_data, True) or "").split() 82 packages_dynamic = (bb.data.getVar('PACKAGES_DYNAMIC', bb_data, True) or "").split()
83 rprovides = Set((bb.data.getVar("RPROVIDES_%s" % pn, bb_data, 1) or "").split() + (bb.data.getVar("RPROVIDES", bb_data, 1) or "").split())
84 84
85 85
86 # build PackageName to FileName lookup table 86 # build PackageName to FileName lookup table
@@ -656,6 +656,7 @@ class BBCooker:
656 rdepends += bb.utils.explode_deps(bb.data.getVar('RDEPENDS', the_data, True) or "") 656 rdepends += bb.utils.explode_deps(bb.data.getVar('RDEPENDS', the_data, True) or "")
657 rdepends += bb.utils.explode_deps(bb.data.getVar('RRECOMMENDS', the_data, True) or "") 657 rdepends += bb.utils.explode_deps(bb.data.getVar('RRECOMMENDS', the_data, True) or "")
658 rdepends += bb.utils.explode_deps(bb.data.getVar("RDEPENDS_%s" % pn, the_data, True) or "") 658 rdepends += bb.utils.explode_deps(bb.data.getVar("RDEPENDS_%s" % pn, the_data, True) or "")
659 rdepends += bb.utils.explode_deps(bb.data.getVar('RRECOMMENDS_%s' % pn, the_data, True) or "")
659 else: 660 else:
660 packages = (bb.data.getVar('PACKAGES', the_data, 1).split() or "") 661 packages = (bb.data.getVar('PACKAGES', the_data, 1).split() or "")
661 for package in packages: 662 for package in packages: