[oe-commits] Richard Purdie : update-rc.d: Improve RRECOMMENDS handling

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 053b8a4e6b9a4b02c0b1b4bc1e297a1251a901a9
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=053b8a4e6b9a4b02c0b1b4bc1e297a1251a901a9

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Wed May 27 17:28:12 2015 +0100

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 at linuxfoundation.org>

---

 meta/classes/update-rc.d.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass
index a9c0323..c385635 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 \