1 files changed, 2 insertions, 0 deletions
diff --git a/meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.22.2.bbappend b/meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.22.2.bbappend
index 12a9823c8..fae15a054 100644
--- a/meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.22.2.bbappend
+++ b/meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.22.2.bbappend
@@ -5,4 +5,6 @@ PRINC := "${@int(PRINC) + 2}"
 SYSTEMD_UNITDIR = "${systemd_unitdir}/system"
 EXTRA_OECONF += "--enable-socket-activation --with-systemdsystemunitdir=${SYSTEMD_UNITDIR}"
 RPROVIDES_${PN} += "${PN}-systemd"
+RREPLACES_${PN} += "${PN}-systemd"
+RCONFLICTS_${PN} += "${PN}-systemd"
 SYSTEMD_SERVICE_${PN} = "uuidd.socket"

diff --git a/meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.22.2.bbappend b/meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.22.2.bbappend index 12a9823c8..fae15a054 100644 --- a/meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.22.2.bbappend +++ b/meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.22.2.bbappend
@@ -5,4 +5,6 @@ PRINC := "${@int(PRINC) + 2}"
5	SYSTEMD_UNITDIR = "${systemd_unitdir}/system"	5	SYSTEMD_UNITDIR = "${systemd_unitdir}/system"
6	EXTRA_OECONF += "--enable-socket-activation --with-systemdsystemunitdir=${SYSTEMD_UNITDIR}"	6	EXTRA_OECONF += "--enable-socket-activation --with-systemdsystemunitdir=${SYSTEMD_UNITDIR}"
7	RPROVIDES_${PN} += "${PN}-systemd"	7	RPROVIDES_${PN} += "${PN}-systemd"
		8	RREPLACES_${PN} += "${PN}-systemd"
		9	RCONFLICTS_${PN} += "${PN}-systemd"
8	SYSTEMD_SERVICE_${PN} = "uuidd.socket"	10	SYSTEMD_SERVICE_${PN} = "uuidd.socket"