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-29 10:17:14 +0100 |
commit | 3b627bb28c4ea2ea33050ad4884c6351e2d6ebad (patch) | |
tree | c1c05673f523a7cbd19dfed75c209b5709523b9e /meta | |
parent | 2f0fcb22d7fef814f8cb5a2479ff04a8301bd0ac (diff) | |
download | poky-3b627bb28c4ea2ea33050ad4884c6351e2d6ebad.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.
(From OE-Core rev: 053b8a4e6b9a4b02c0b1b4bc1e297a1251a901a9)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 a9c0323f95..c385635a42 100644 --- a/meta/classes/update-rc.d.bbclass +++ b/meta/classes/update-rc.d.bbclass | |||
@@ -8,8 +8,6 @@ UPDATERCD_class-cross = "" | |||
8 | UPDATERCD_class-native = "" | 8 | UPDATERCD_class-native = "" |
9 | UPDATERCD_class-nativesdk = "" | 9 | UPDATERCD_class-nativesdk = "" |
10 | 10 | ||
11 | RRECOMMENDS_${UPDATERCPN}_append = " ${UPDATERCD}" | ||
12 | |||
13 | INITSCRIPT_PARAMS ?= "defaults" | 11 | INITSCRIPT_PARAMS ?= "defaults" |
14 | 12 | ||
15 | INIT_D_DIR = "${sysconfdir}/init.d" | 13 | INIT_D_DIR = "${sysconfdir}/init.d" |
@@ -120,6 +118,8 @@ python populate_packages_updatercd () { | |||
120 | postrm += localdata.getVar('updatercd_postrm', True) | 118 | postrm += localdata.getVar('updatercd_postrm', True) |
121 | d.setVar('pkg_postrm_%s' % pkg, postrm) | 119 | d.setVar('pkg_postrm_%s' % pkg, postrm) |
122 | 120 | ||
121 | d.appendVar('RRECOMMENDS_' + pkg, " ${UPDATERCD}") | ||
122 | |||
123 | # Check that this class isn't being inhibited (generally, by | 123 | # Check that this class isn't being inhibited (generally, by |
124 | # systemd.bbclass) before doing any work. | 124 | # systemd.bbclass) before doing any work. |
125 | if bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d) or \ | 125 | if bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d) or \ |