From 2169783eb903d9e098172dc1194a74f53297319e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 22 Nov 2010 21:49:22 +0100 Subject: use empty default for keyboard layout, rebuild when changed --- Config.in | 2 +- package/bkeymaps/Makefile | 7 ++++--- package/bkeymaps/files/bkeymaps.postinst | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Config.in b/Config.in index d0cf133de..30c8d6874 100644 --- a/Config.in +++ b/Config.in @@ -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 -- cgit v1.2.3