From 7be95a25e0c794a5b4e308185242e284447da288 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 13 Apr 2013 13:22:11 +0200 Subject: keymaps: move bbappend to oe-core subdirectory Signed-off-by: Martin Jansa --- .../meta-oe/recipes-bsp/keymaps/keymaps/keymaps.service | 9 --------- .../meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend | 16 ---------------- .../oe-core/recipes-bsp/keymaps/keymaps/keymaps.service | 9 +++++++++ .../oe-core/recipes-bsp/keymaps/keymaps_1.0.bbappend | 16 ++++++++++++++++ 4 files changed, 25 insertions(+), 25 deletions(-) delete mode 100644 meta-systemd/meta-oe/recipes-bsp/keymaps/keymaps/keymaps.service delete mode 100644 meta-systemd/meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend create mode 100644 meta-systemd/oe-core/recipes-bsp/keymaps/keymaps/keymaps.service create mode 100644 meta-systemd/oe-core/recipes-bsp/keymaps/keymaps_1.0.bbappend (limited to 'meta-systemd') diff --git a/meta-systemd/meta-oe/recipes-bsp/keymaps/keymaps/keymaps.service b/meta-systemd/meta-oe/recipes-bsp/keymaps/keymaps/keymaps.service deleted file mode 100644 index 414ad0cf00..0000000000 --- a/meta-systemd/meta-oe/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/meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend b/meta-systemd/meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend deleted file mode 100644 index 9d970254fa..0000000000 --- a/meta-systemd/meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend +++ /dev/null @@ -1,16 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PRINC := "${@int(PRINC) + 7}" - -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 -} - diff --git a/meta-systemd/oe-core/recipes-bsp/keymaps/keymaps/keymaps.service b/meta-systemd/oe-core/recipes-bsp/keymaps/keymaps/keymaps.service new file mode 100644 index 0000000000..414ad0cf00 --- /dev/null +++ b/meta-systemd/oe-core/recipes-bsp/keymaps/keymaps/keymaps.service @@ -0,0 +1,9 @@ +[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 new file mode 100644 index 0000000000..9d970254fa --- /dev/null +++ b/meta-systemd/oe-core/recipes-bsp/keymaps/keymaps_1.0.bbappend @@ -0,0 +1,16 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +PRINC := "${@int(PRINC) + 7}" + +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 1.2.3-korg