From 913ae2e716c528e02f2322789c04154b366332c1 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 17 Sep 2014 15:29:55 +0100 Subject: keymaps: systemd support now in OE-Core Signed-off-by: Paul Eggleton --- .../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(-) delete mode 100644 meta-systemd/oe-core/recipes-bsp/keymaps/keymaps/keymaps.service (limited to 'meta-systemd/oe-core/recipes-bsp') 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 414ad0cf0..000000000 --- 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 bc40c6022..181b8784d 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 -} -- cgit v1.2.3-54-g00ecf