[oe-commits] Martin Jansa : util-linux: Rename .bbappend to match any version from oe-core and remove uuidd.socket

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: 895812d0d7d3cfdc5884db33e229b038f0799e28
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=895812d0d7d3cfdc5884db33e229b038f0799e28

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Fri Mar 14 20:07:29 2014 +0100

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 <Martin.Jansa at gmail.com>

---

 .../oe-core/recipes-core/util-linux/util-linux_%.bbappend      |  3 +++
 .../oe-core/recipes-core/util-linux/util-linux_2.23.2.bbappend | 10 ----------
 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 0000000..f006b3f
--- /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 c6a97ca..0000000
--- 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"