diff --git a/packages/x11/app/setxkbmap/package.mk b/packages/x11/app/setxkbmap/package.mk index e6ecf12824..bd3751319b 100644 --- a/packages/x11/app/setxkbmap/package.mk +++ b/packages/x11/app/setxkbmap/package.mk @@ -31,8 +31,3 @@ PKG_LONGDESC="Setxkbmap sets the keyboard using the X Keyboard Extension." PKG_IS_ADDON="no" PKG_AUTORECONF="yes" - -post_makeinstall_target() { - mkdir -p $INSTALL/usr/lib/udev - cp $PKG_DIR/scripts/xkb-setup $INSTALL/usr/lib/udev -} diff --git a/packages/x11/app/setxkbmap/scripts/xkb-setup b/packages/x11/app/setxkbmap/scripts/xkb-setup deleted file mode 100755 index 73c2d69602..0000000000 --- a/packages/x11/app/setxkbmap/scripts/xkb-setup +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) -# -# OpenELEC is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# OpenELEC is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC. If not, see . -################################################################################ - -if [ -f /storage/.cache/xkb/layout ] ; then - cat /storage/.cache/xkb/layout -fi diff --git a/packages/x11/app/setxkbmap/udev.d/98-xorg-xkb.rules b/packages/x11/app/setxkbmap/udev.d/98-xorg-xkb.rules index a99b7f3c1e..b6811876f7 100644 --- a/packages/x11/app/setxkbmap/udev.d/98-xorg-xkb.rules +++ b/packages/x11/app/setxkbmap/udev.d/98-xorg-xkb.rules @@ -2,7 +2,7 @@ ACTION!="add|change", GOTO="xorg_xkb_end" SUBSYSTEM!="input", GOTO="xorg_xkb_end" KERNEL!="event*", GOTO="xorg_xkb_end" -ENV{ID_INPUT_KEY}=="?*", IMPORT{program}="xkb-setup" +ENV{ID_INPUT_KEY}=="?*", IMPORT{file}="/storage/.cache/xkb/layout" LABEL="xorg_xkb_end"