summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorChangqing Li <changqing.li@windriver.com>2019-05-30 13:32:20 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-30 12:37:03 +0100
commit70db12c8522840ddcb8c6dcbc08251f095c75c65 (patch)
treec4344616d0a863e62b40ebf5ec858c4e1f4bb64e /meta/recipes-core
parent41bd3fee9db390d4d5e885aed007cb54c3d9bed5 (diff)
downloadpoky-70db12c8522840ddcb8c6dcbc08251f095c75c65.tar.gz
systemd: add rconflicts
add rconflicts since error during do_rootfs: file /sbin/resolvconf conflicts between attempted installs of resolvconf-1.79-r0.noarch and systemd-1:242+0+db2e367bfc-r0.i586 file /sbin/init conflicts between attempted installs of tiny-init-1.0-r3.i586 and systemd-1:242+0+db2e367bfc-r0.i586 (From OE-Core rev: 10d0a824ad9b835b6f5ec24a49d41aead613031b) Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/systemd/systemd_242.bb2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd_242.bb b/meta/recipes-core/systemd/systemd_242.bb
index 93a23dd987..90f235be3d 100644
--- a/meta/recipes-core/systemd/systemd_242.bb
+++ b/meta/recipes-core/systemd/systemd_242.bb
@@ -603,6 +603,8 @@ FILES_udev += "${base_sbindir}/udevd \
603 603
604FILES_udev-hwdb = "${rootlibexecdir}/udev/hwdb.d" 604FILES_udev-hwdb = "${rootlibexecdir}/udev/hwdb.d"
605 605
606RCONFLICTS_${PN} = "tiny-init ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'resolvconf', '', d)}"
607
606INITSCRIPT_PACKAGES = "udev" 608INITSCRIPT_PACKAGES = "udev"
607INITSCRIPT_NAME_udev = "systemd-udevd" 609INITSCRIPT_NAME_udev = "systemd-udevd"
608INITSCRIPT_PARAMS_udev = "start 03 S ." 610INITSCRIPT_PARAMS_udev = "start 03 S ."