summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-06 16:47:42 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-10 12:13:06 +0100
commit3578a05aed3899f7a1fa4c843233a86fe6952898 (patch)
treed4819cfb7136fdf8598e7fdd572716be9a80a6eb /meta/recipes-core
parenta81753fff9200d0590a51d3576f7306e5358da8c (diff)
downloadpoky-3578a05aed3899f7a1fa4c843233a86fe6952898.tar.gz
busybox: Ensure busybox-syslog depends on busybox
If we don't do this, busybox-syslog can install before busybox which clearly doesn't make sense and can trigger postinst failures (missing sed which u-a depends upon). (From OE-Core rev: 7080711849347c7fff55f925c33e6ea69d7c46bb) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/busybox/busybox.inc1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index c02e0623e3..2ad29a7e72 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -41,6 +41,7 @@ INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd"
41SYSTEMD_PACKAGES = "${PN}-syslog" 41SYSTEMD_PACKAGES = "${PN}-syslog"
42SYSTEMD_SERVICE_${PN}-syslog = "${@bb.utils.contains('SRC_URI', 'file://syslog.cfg', 'busybox-syslog.service', '', d)}" 42SYSTEMD_SERVICE_${PN}-syslog = "${@bb.utils.contains('SRC_URI', 'file://syslog.cfg', 'busybox-syslog.service', '', d)}"
43 43
44RDEPENDS_${PN}-syslog = "busybox"
44CONFFILES_${PN}-syslog = "${sysconfdir}/syslog-startup.conf" 45CONFFILES_${PN}-syslog = "${sysconfdir}/syslog-startup.conf"
45RCONFLICTS_${PN}-syslog = "rsyslog sysklogd syslog-ng" 46RCONFLICTS_${PN}-syslog = "rsyslog sysklogd syslog-ng"
46 47