Browse Source

use empty default for keyboard layout, rebuild when changed

Waldemar Brodkorb 15 years ago
parent
commit
2169783eb9
3 changed files with 6 additions and 5 deletions
  1. 1 1
      Config.in
  2. 4 3
      package/bkeymaps/Makefile
  3. 1 1
      package/bkeymaps/files/bkeymaps.postinst

+ 1 - 1
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.

+ 4 - 3
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

+ 1 - 1
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