diff options
Diffstat (limited to 'meta/classes/packagegroup.bbclass')
-rw-r--r-- | meta/classes/packagegroup.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/packagegroup.bbclass b/meta/classes/packagegroup.bbclass index 3928c8a4ac..a60a52b6d4 100644 --- a/meta/classes/packagegroup.bbclass +++ b/meta/classes/packagegroup.bbclass | |||
@@ -16,15 +16,15 @@ PACKAGE_ARCH_EXPANDED := "${PACKAGE_ARCH}" | |||
16 | 16 | ||
17 | LICENSE ?= "MIT" | 17 | LICENSE ?= "MIT" |
18 | 18 | ||
19 | inherit ${@oe.utils.ifelse(d.getVar('PACKAGE_ARCH_EXPANDED', True) == 'all', 'allarch', '')} | 19 | inherit ${@oe.utils.ifelse(d.getVar('PACKAGE_ARCH_EXPANDED') == 'all', 'allarch', '')} |
20 | 20 | ||
21 | # This automatically adds -dbg and -dev flavours of all PACKAGES | 21 | # This automatically adds -dbg and -dev flavours of all PACKAGES |
22 | # to the list. Their dependencies (RRECOMMENDS) are handled as usual | 22 | # to the list. Their dependencies (RRECOMMENDS) are handled as usual |
23 | # by package_depchains in a following step. | 23 | # by package_depchains in a following step. |
24 | # Also mark all packages as ALLOW_EMPTY | 24 | # Also mark all packages as ALLOW_EMPTY |
25 | python () { | 25 | python () { |
26 | packages = d.getVar('PACKAGES', True).split() | 26 | packages = d.getVar('PACKAGES').split() |
27 | if d.getVar('PACKAGEGROUP_DISABLE_COMPLEMENTARY', True) != '1': | 27 | if d.getVar('PACKAGEGROUP_DISABLE_COMPLEMENTARY') != '1': |
28 | types = ['', '-dbg', '-dev'] | 28 | types = ['', '-dbg', '-dev'] |
29 | if bb.utils.contains('DISTRO_FEATURES', 'ptest', True, False, d): | 29 | if bb.utils.contains('DISTRO_FEATURES', 'ptest', True, False, d): |
30 | types.append('-ptest') | 30 | types.append('-ptest') |
@@ -49,7 +49,7 @@ do_install[noexec] = "1" | |||
49 | do_populate_sysroot[noexec] = "1" | 49 | do_populate_sysroot[noexec] = "1" |
50 | 50 | ||
51 | python () { | 51 | python () { |
52 | initman = d.getVar("VIRTUAL-RUNTIME_init_manager", True) | 52 | initman = d.getVar("VIRTUAL-RUNTIME_init_manager") |
53 | if initman and initman in ['sysvinit', 'systemd'] and not bb.utils.contains('DISTRO_FEATURES', initman, True, False, d): | 53 | if initman and initman in ['sysvinit', 'systemd'] and not bb.utils.contains('DISTRO_FEATURES', initman, True, False, d): |
54 | bb.fatal("Please ensure that your setting of VIRTUAL-RUNTIME_init_manager (%s) matches the entries enabled in DISTRO_FEATURES" % initman) | 54 | bb.fatal("Please ensure that your setting of VIRTUAL-RUNTIME_init_manager (%s) matches the entries enabled in DISTRO_FEATURES" % initman) |
55 | } | 55 | } |