diff options
| author | Changqing Li <changqing.li@windriver.com> | 2019-05-29 17:35:05 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-30 12:37:03 +0100 |
| commit | 6ba8e155b65d446bd4f5ee695501e5b431c478c2 (patch) | |
| tree | 86628b32cc6931c9a37141f2c338375cef06090b /meta-poky/recipes-core | |
| parent | 482da97cfc8b926fd5e5f3c9e8e7933741937ad1 (diff) | |
| download | poky-6ba8e155b65d446bd4f5ee695501e5b431c478c2.tar.gz | |
tiny-init: add rconflicts
add rconflicts since error during do_rootfs:
file /sbin/init conflicts between attempted installs of tiny-init-1.0-r3.i586 and systemd-1:242+0+db2e367bfc-r0.i586
(From meta-yocto rev: 28bdd6efe8a4fff12ee169a227762ec0978dab36)
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-poky/recipes-core')
| -rw-r--r-- | meta-poky/recipes-core/tiny-init/tiny-init.bb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta-poky/recipes-core/tiny-init/tiny-init.bb b/meta-poky/recipes-core/tiny-init/tiny-init.bb index 4d4e34dc8b..44c8e1bf5e 100644 --- a/meta-poky/recipes-core/tiny-init/tiny-init.bb +++ b/meta-poky/recipes-core/tiny-init/tiny-init.bb | |||
| @@ -28,3 +28,4 @@ do_install() { | |||
| 28 | } | 28 | } |
| 29 | 29 | ||
| 30 | FILES_${PN} = "/init ${sysconfdir}/rc.local.sample" | 30 | FILES_${PN} = "/init ${sysconfdir}/rc.local.sample" |
| 31 | RCONFLICTS_${PN} = "systemd" | ||