summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-05 12:34:19 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-05 13:14:58 +0000
commit51997fee89dc458a98eb053767247bdafe9b1297 (patch)
tree35134f8461659061170acb8ec6ae6f746b7b2f8f /meta
parent81ac27598414a7a9bf6bee747c8c0020ac88ed25 (diff)
downloadpoky-51997fee89dc458a98eb053767247bdafe9b1297.tar.gz
packagegroup: Set ALLOW_EMPTY on a per package basis
ALLOW_EMPTY should be set on a per package basis, this updates the code to do this, avoiding warnings. (From OE-Core rev: 8981ed20234c42dc1f5cdef802ebe7214bd55238) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/packagegroup.bbclass12
1 files changed, 4 insertions, 8 deletions
diff --git a/meta/classes/packagegroup.bbclass b/meta/classes/packagegroup.bbclass
index af6ee5dff1..201309c28f 100644
--- a/meta/classes/packagegroup.bbclass
+++ b/meta/classes/packagegroup.bbclass
@@ -1,9 +1,5 @@
1# Class for packagegroup (package group) recipes 1# Class for packagegroup (package group) recipes
2 2
3# packagegroup packages are only used to pull in other packages
4# via their dependencies. They are empty.
5ALLOW_EMPTY = "1"
6
7# By default, only the packagegroup package itself is in PACKAGES. 3# By default, only the packagegroup package itself is in PACKAGES.
8# -dbg and -dev flavours are handled by the anonfunc below. 4# -dbg and -dev flavours are handled by the anonfunc below.
9# This means that packagegroup recipes used to build multiple packagegroup 5# This means that packagegroup recipes used to build multiple packagegroup
@@ -18,16 +14,16 @@ inherit allarch
18# This automatically adds -dbg and -dev flavours of all PACKAGES 14# This automatically adds -dbg and -dev flavours of all PACKAGES
19# to the list. Their dependencies (RRECOMMENDS) are handled as usual 15# to the list. Their dependencies (RRECOMMENDS) are handled as usual
20# by package_depchains in a following step. 16# by package_depchains in a following step.
17# Also mark all packages as ALLOW_EMPTY
21python () { 18python () {
22 if d.getVar('PACKAGEGROUP_DISABLE_COMPLEMENTARY', True) == '1':
23 return
24
25 packages = d.getVar('PACKAGES', True).split() 19 packages = d.getVar('PACKAGES', True).split()
26 genpackages = [] 20 genpackages = []
27 for pkg in packages: 21 for pkg in packages:
22 d.setVar("ALLOW_EMPTY_%s" % pkg, "1")
28 for postfix in ['-dbg', '-dev', '-ptest']: 23 for postfix in ['-dbg', '-dev', '-ptest']:
29 genpackages.append(pkg+postfix) 24 genpackages.append(pkg+postfix)
30 d.setVar('PACKAGES', ' '.join(packages+genpackages)) 25 if d.getVar('PACKAGEGROUP_DISABLE_COMPLEMENTARY', True) != '1':
26 d.setVar('PACKAGES', ' '.join(packages+genpackages))
31} 27}
32 28
33# We don't want to look at shared library dependencies for the 29# We don't want to look at shared library dependencies for the