[oe-commits] Paul Eggleton : keymaps: systemd support now in OE-Core

[git at git.openembedded.org]

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

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Wed Sep 17 15:29:55 2014 +0100

keymaps: systemd support now in OE-Core

Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>

---

 .../oe-core/recipes-bsp/keymaps/keymaps/keymaps.service       |  9 ---------
 meta-systemd/oe-core/recipes-bsp/keymaps/keymaps_1.0.bbappend | 11 -----------
 2 files changed, 20 deletions(-)

diff --git a/meta-systemd/oe-core/recipes-bsp/keymaps/keymaps/keymaps.service b/meta-systemd/oe-core/recipes-bsp/keymaps/keymaps/keymaps.service
deleted file mode 100644
index 414ad0c..0000000
--- a/meta-systemd/oe-core/recipes-bsp/keymaps/keymaps/keymaps.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Loads custom keymap if available
-ConditionPathExists=/etc/keymap-2.6.map
-
-[Service]
-ExecStart=/usr/bin/loadkeys /etc/keymap-2.6.map
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-systemd/oe-core/recipes-bsp/keymaps/keymaps_1.0.bbappend b/meta-systemd/oe-core/recipes-bsp/keymaps/keymaps_1.0.bbappend
index bc40c60..181b878 100644
--- a/meta-systemd/oe-core/recipes-bsp/keymaps/keymaps_1.0.bbappend
+++ b/meta-systemd/oe-core/recipes-bsp/keymaps/keymaps_1.0.bbappend
@@ -1,15 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += " file://keymaps.service"
-
-inherit systemd
 RPROVIDES_${PN} += "${PN}-systemd"
 RREPLACES_${PN} += "${PN}-systemd"
 RCONFLICTS_${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE_${PN} = "${PN}.service"
-
-do_install_append() {
-    install -d ${D}${systemd_unitdir}/system
-    install -m 0644 ${WORKDIR}/${PN}.service ${D}${systemd_unitdir}/system
-}