update-rc.d: Improve RRECOMMENDS handling

PATCH New Richard Purdie 1 participant 1 message May 27, 2015

lore

Share & tools

lore

Richard Purdie

author

2015-05-27 16:28 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

meta/classes/update-rc.d.bbclass +2 -2

index a9c0323..c385635 100644
@@ -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 \