瀏覽代碼

fix kbd setup

Waldemar Brodkorb 10 年之前
父節點
當前提交
c1178ff404
共有 3 個文件被更改,包括 6 次插入3 次删除
  1. 3 1
      package/kbd/Makefile
  2. 1 1
      package/kbd/files/kbd.init
  3. 2 1
      target/config/Config.in.runtime

+ 3 - 1
package/kbd/Makefile

@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		kbd
 PKG_VERSION:=		2.0.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_HASH:=		9dfddabf96012e329c4bebb96a21aeef7c3872f624e96e8156ba542b82aeb912
 PKG_DESCR:=		keyboard utility
 PKG_SECTION:=		sys/hw
@@ -14,6 +14,8 @@ PKG_BUILDDEP:=		flex-host bison-host check
 PKG_URL:=		http://kbd-project.org/
 PKG_SITES:=		http://kbd-project.org/download/
 
+PKG_CFLINE_KBD:=	default y if ADK_TARGET_WITH_INPUT
+
 include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,KBD,kbd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))

+ 1 - 1
package/kbd/files/kbd.init

@@ -11,7 +11,7 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	loadkeys /etc/${kbd_map}.map
+	loadkeys ${kbd_map}
 	;;
 stop)
 	;;

+ 2 - 1
target/config/Config.in.runtime

@@ -186,9 +186,10 @@ config ADK_RUNTIME_CONSOLE_SERIAL_SPEED
 config ADK_RUNTIME_KBD_LAYOUT
 	string "keyboard layout for the embedded system"
 	depends on ADK_TARGET_WITH_INPUT
-	default ""
+	default "de-latin1-nodeadkeys"
 	help
 	  Predefine the keyboard layout for the embedded system.
+	  For example use de-latin1-nodeadkeys.
 
 choice
 prompt "initial login shell for the root user"