summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-systemd/oe-core/recipes-core/util-linux/util-linux_%.bbappend3
-rw-r--r--meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.23.2.bbappend10
2 files changed, 3 insertions, 10 deletions
diff --git a/meta-systemd/oe-core/recipes-core/util-linux/util-linux_%.bbappend b/meta-systemd/oe-core/recipes-core/util-linux/util-linux_%.bbappend
new file mode 100644
index 0000000000..f006b3fb5b
--- /dev/null
+++ b/meta-systemd/oe-core/recipes-core/util-linux/util-linux_%.bbappend
@@ -0,0 +1,3 @@
1RPROVIDES_${PN} += "${PN}-systemd"
2RREPLACES_${PN} += "${PN}-systemd"
3RCONFLICTS_${PN} += "${PN}-systemd"
diff --git a/meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.23.2.bbappend b/meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.23.2.bbappend
deleted file mode 100644
index c6a97ca320..0000000000
--- a/meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.23.2.bbappend
+++ /dev/null
@@ -1,10 +0,0 @@
1inherit systemd
2
3SYSTEMD_UNITDIR = "${systemd_unitdir}/system"
4EXTRA_OECONF += "--enable-socket-activation --with-systemdsystemunitdir=${SYSTEMD_UNITDIR}"
5
6RPROVIDES_${PN} += "${PN}-systemd"
7RREPLACES_${PN} += "${PN}-systemd"
8RCONFLICTS_${PN} += "${PN}-systemd"
9
10SYSTEMD_SERVICE_${PN} = "uuidd.socket"