diff options
| author | Mariano Lopez <mariano.lopez@linux.intel.com> | 2016-06-10 11:48:53 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-15 17:36:35 +0100 |
| commit | 5b2139a79cd8c280e755923016b3a6e84413184e (patch) | |
| tree | 2e13814403d3a428f8c73286ad2b96f317a07f58 /meta/classes/update-rc.d.bbclass | |
| parent | 862c9cbbef1f17b57c0ea369d88194b60623ffdd (diff) | |
| download | openembedded-core-5b2139a79cd8c280e755923016b3a6e84413184e.tar.gz openembedded-core-5b2139a79cd8c280e755923016b3a6e84413184e.tar.bz2 openembedded-core-5b2139a79cd8c280e755923016b3a6e84413184e.zip | |
update-rc.d.bbclass: Disable class when sysvinit is not in DISTRO_FEATURES
When sysvinit is not in use, update-rd.d class adds build dependencies
that won't be needed, this patch removes the build dependecies and
won't add the task to PACKAGESPLITFUNCS.
[YOCTO #9515]
Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/classes/update-rc.d.bbclass')
| -rw-r--r-- | meta/classes/update-rc.d.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass index 2a0a74a5f5..82b80245d4 100644 --- a/meta/classes/update-rc.d.bbclass +++ b/meta/classes/update-rc.d.bbclass @@ -1,6 +1,7 @@ UPDATERCPN ?= "${PN}" -DEPENDS_append_class-target = " update-rc.d-native update-rc.d initscripts" +DEPENDS_append_class-target = "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', ' update-rc.d-native update-rc.d initscripts', '', d)}" + UPDATERCD = "update-rc.d" UPDATERCD_class-cross = "" UPDATERCD_class-native = "" @@ -64,7 +65,7 @@ python __anonymous() { update_rc_after_parse(d) } -PACKAGESPLITFUNCS_prepend = "populate_packages_updatercd " +PACKAGESPLITFUNCS_prepend = "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'populate_packages_updatercd ', '', d)}" PACKAGESPLITFUNCS_remove_class-nativesdk = "populate_packages_updatercd " populate_packages_updatercd[vardeps] += "updatercd_prerm updatercd_postrm updatercd_preinst updatercd_postinst" @@ -120,8 +121,7 @@ python populate_packages_updatercd () { # Check that this class isn't being inhibited (generally, by # systemd.bbclass) before doing any work. - if bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d) or \ - not d.getVar("INHIBIT_UPDATERCD_BBCLASS", True): + if not d.getVar("INHIBIT_UPDATERCD_BBCLASS", True): pkgs = d.getVar('INITSCRIPT_PACKAGES', True) if pkgs == None: pkgs = d.getVar('UPDATERCPN', True) |