From 5b8498b53dcdf2ed797cbd2049dd3856ef17e2ff Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 14 Mar 2014 20:07:29 +0100 Subject: [PATCH] util-linux: Rename .bbappend to match any version from oe-core and remove uuidd.socket * oe-core recipe has uuidd.service in ${PN}-uuidd SYSTEMD_PACKAGES = "${PN}-uuidd" SYSTEMD_SERVICE_${PN}-uuidd = "uuidd.service" Signed-off-by: Martin Jansa --- .../recipes-core/util-linux/util-linux_%.bbappend | 3 +++ .../recipes-core/util-linux/util-linux_2.23.2.bbappend | 10 ---------- 2 files changed, 3 insertions(+), 10 deletions(-) create mode 100644 meta-systemd/oe-core/recipes-core/util-linux/util-linux_%.bbappend delete mode 100644 meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.23.2.bbappend 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 @@ +RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${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 @@ -inherit systemd - -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"