diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-11-22 21:49:22 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-11-22 21:49:22 +0100 |
| commit | 2169783eb903d9e098172dc1194a74f53297319e (patch) | |
| tree | 574f30628245abc79a624dcf4f71f44a83c332de | |
| parent | 49a04727cbc3b62758dcb81043e5fc3f9787bd56 (diff) | |
use empty default for keyboard layout, rebuild when changed
| -rw-r--r-- | Config.in | 2 | ||||
| -rw-r--r-- | package/bkeymaps/Makefile | 7 | ||||
| -rw-r--r-- | package/bkeymaps/files/bkeymaps.postinst | 2 |
3 files changed, 6 insertions, 5 deletions
@@ -210,7 +210,7 @@ config ADK_RUNTIME_TIMEZONE config ADK_RUNTIME_KBD_LAYOUT string "keyboard layout for the embedded system" - default "en" + default "" depends on ADK_TARGET_WITH_INPUT help Predefine the keyboard layout for the embedded system. diff --git a/package/bkeymaps/Makefile b/package/bkeymaps/Makefile index 735bc38f8..74f37f91d 100644 --- a/package/bkeymaps/Makefile +++ b/package/bkeymaps/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= bkeymaps PKG_VERSION:= 1.13 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= a68058ab4a81cf9a8dcbaaa7a5df5b11 PKG_DESCR:= binary keymaps for busybox loadkmap PKG_SECTION:= utils @@ -26,8 +26,9 @@ KBD_LAYOUT:=$(strip $(subst ",, $(ADK_RUNTIME_KBD_LAYOUT))) KBD_DIR:=$(shell echo $(KBD_LAYOUT)|cut -c 1-2) do-install: - $(INSTALL_DIR) $(IDIR_BKEYMAPS)/usr/share/keymaps/ + test -z $(ADK_RUNTIME_KBD_LAYOUT) || \ + ($(INSTALL_DIR) $(IDIR_BKEYMAPS)/usr/share/keymaps/ && \ $(INSTALL_DATA) $(WRKBUILD)/bkeymaps/$(KBD_DIR)/$(KBD_LAYOUT).bmap \ - $(IDIR_BKEYMAPS)/usr/share/keymaps/keymap.bmap + $(IDIR_BKEYMAPS)/usr/share/keymaps/keymap.bmap ); include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/bkeymaps/files/bkeymaps.postinst b/package/bkeymaps/files/bkeymaps.postinst index 8af581f06..07dace565 100644 --- a/package/bkeymaps/files/bkeymaps.postinst +++ b/package/bkeymaps/files/bkeymaps.postinst @@ -1,4 +1,4 @@ #!/bin/sh . $IPKG_INSTROOT/etc/functions.sh -add_rcconf bkeymaps kbd NO +add_rcconf bkeymaps kbd YES |