aboutsummaryrefslogtreecommitdiffstats
path: root/meta-systemd
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2014-09-17 15:29:55 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2014-09-26 05:41:52 +0200
commit913ae2e716c528e02f2322789c04154b366332c1 (patch)
tree13f8612f6c5ad86b376f6153d783a3da3a402ee1 /meta-systemd
parentdee376383721781118c6115a4593ad969e0830c1 (diff)
downloadmeta-openembedded-contrib-913ae2e716c528e02f2322789c04154b366332c1.tar.gz
keymaps: systemd support now in OE-Core
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta-systemd')
-rw-r--r--meta-systemd/oe-core/recipes-bsp/keymaps/keymaps/keymaps.service9
-rw-r--r--meta-systemd/oe-core/recipes-bsp/keymaps/keymaps_1.0.bbappend11
2 files changed, 0 insertions, 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 414ad0cf00..0000000000
--- 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 bc40c6022b..181b8784dd 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
-}