diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-27 17:28:12 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-27 17:44:31 +0100 |
| commit | 053b8a4e6b9a4b02c0b1b4bc1e297a1251a901a9 (patch) | |
| tree | 2402bce16bdd968d327bd73ffdfa8200db8d3e43 | |
| parent | 03482382b797f3501c3fb0df0fe12bd4e5e51a39 (diff) | |
| download | openembedded-core-contrib-053b8a4e6b9a4b02c0b1b4bc1e297a1251a901a9.tar.gz | |
update-rc.d: Improve RRECOMMENDS handling
Unfortunately the combination of:
RRECOMMENDS_${PN} = "X"
UPDATERCPN = "${PN}"
RRECOMMENDS_${UPDATERCPN}_append = "Y"
is tricky for bitbake to order correctly since RRECOMMENDS_${UPDATERCPN} can
become "Y" which can then completely overwrite RRECOMMENDS_${PN}.
Avoid these issues and improve handling in general by explictly setting
the RRECOMMENDS on the list of packages modified in the general
code.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/update-rc.d.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass index a9c0323f95f..c385635a42d 100644 --- a/meta/classes/update-rc.d.bbclass +++ b/meta/classes/update-rc.d.bbclass @@ -8,8 +8,6 @@ UPDATERCD_class-cross = "" UPDATERCD_class-native = "" UPDATERCD_class-nativesdk = "" -RRECOMMENDS_${UPDATERCPN}_append = " ${UPDATERCD}" - INITSCRIPT_PARAMS ?= "defaults" INIT_D_DIR = "${sysconfdir}/init.d" @@ -120,6 +118,8 @@ python populate_packages_updatercd () { postrm += localdata.getVar('updatercd_postrm', True) d.setVar('pkg_postrm_%s' % pkg, postrm) + d.appendVar('RRECOMMENDS_' + pkg, " ${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 \ |