* [PATCH 1/1] update-rc.d.bbclass: Disable class when sysvinit is not in DISTRO_FEATURES [not found] <cover.1465559091.git.mariano.lopez@linux.intel.com> @ 2016-06-10 11:48 ` mariano.lopez 0 siblings, 0 replies; 3+ messages in thread From: mariano.lopez @ 2016-06-10 11:45 UTC (permalink / raw) To: bitbake-devel From: Mariano Lopez <mariano.lopez@linux.intel.com> 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> --- meta/classes/update-rc.d.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass index 2a0a74a..82b8024 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) -- 2.6.6 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 1/1] update-rc.d.bbclass: Disable class when sysvinit is not in DISTRO_FEATURES @ 2016-06-10 11:48 ` mariano.lopez 0 siblings, 0 replies; 3+ messages in thread From: mariano.lopez @ 2016-06-10 11:48 UTC (permalink / raw) To: openembedded-core From: Mariano Lopez <mariano.lopez@linux.intel.com> 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> --- meta/classes/update-rc.d.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass index 2a0a74a..82b8024 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) -- 2.6.6 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] update-rc.d.bbclass: Disable class when sysvinit is not in DISTRO_FEATURES 2016-06-10 11:48 ` mariano.lopez (?) @ 2016-06-10 19:53 ` Mariano Lopez -1 siblings, 0 replies; 3+ messages in thread From: Mariano Lopez @ 2016-06-10 19:53 UTC (permalink / raw) To: bitbake-devel On 06/10/2016 06:45 AM, mariano.lopez@linux.intel.com wrote: > From: Mariano Lopez <mariano.lopez@linux.intel.com> > > 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] > Please disregard this patch, it was meant for OE-core. Sorry for the spam Mariano ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-06-10 19:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <cover.1465559091.git.mariano.lopez@linux.intel.com>
2016-06-10 11:45 ` [PATCH 1/1] update-rc.d.bbclass: Disable class when sysvinit is not in DISTRO_FEATURES mariano.lopez
2016-06-10 11:48 ` mariano.lopez
2016-06-10 19:53 ` Mariano Lopez
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.