summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/busybox
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-06 23:40:47 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-10 12:13:07 +0100
commit4b41d9072a304fadbe1cc37c94575f12a2a47fd3 (patch)
treefe8e3036b30b1e6f577bb1b41ee184f90eb11f42 /meta/recipes-core/busybox
parent1aa224368f7d4a571395d7bb05684cb305b2b6d1 (diff)
downloadpoky-4b41d9072a304fadbe1cc37c94575f12a2a47fd3.tar.gz
busybox/packagegroups: Break out the busybox-syslog dependency
The busybox-syslog rrecomends is proving tricky as it gets pulled in early and there are conflicts between its use of update-alternatives and busybox needing to provide those things. We already have recipes using BAD_RRECOMMENDS to remove this dependency, it probably makes sense to spell it out explicitly and allow it to be overridden more easily. This patch does this, dropping the now unneeded BAD_RRECOMMENDS. It preserves the dependency as a recommendation for now, further cleanup may allow simplication of that. This unbreaks certain build failures on the autobuilder, more as a workaround but is a change we probably want to make anyway. (From OE-Core rev: 544ade2d78f1375d9e93d6bf5842d857ddaf3530) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/busybox')
-rw-r--r--meta/recipes-core/busybox/busybox.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 2ad29a7e72..e1fba4243a 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -47,7 +47,7 @@ RCONFLICTS_${PN}-syslog = "rsyslog sysklogd syslog-ng"
47 47
48CONFFILES_${PN}-mdev = "${sysconfdir}/mdev.conf" 48CONFFILES_${PN}-mdev = "${sysconfdir}/mdev.conf"
49 49
50RRECOMMENDS_${PN} = "${PN}-syslog ${PN}-udhcpc" 50RRECOMMENDS_${PN} = "${PN}-udhcpc"
51 51
52RDEPENDS_${PN} = "${@["", "busybox-inittab"][(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'busybox')]}" 52RDEPENDS_${PN} = "${@["", "busybox-inittab"][(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'busybox')]}"
53 53