diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-02-14 11:41:49 -0600 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-02-17 23:19:55 -0600 |
| commit | c1178ff40470683a1b7a7d0ab1e1f459a0f3dff5 (patch) | |
| tree | d4afe30b4473124ee02b897976e8a1e8a627e887 | |
| parent | 26156aafe511edbdf7f6f9c9a729db47ffa06012 (diff) | |
fix kbd setup
| -rw-r--r-- | package/kbd/Makefile | 4 | ||||
| -rw-r--r-- | package/kbd/files/kbd.init | 2 | ||||
| -rw-r--r-- | target/config/Config.in.runtime | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/package/kbd/Makefile b/package/kbd/Makefile index efe2caa24..fceab4913 100644 --- a/package/kbd/Makefile +++ b/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})) diff --git a/package/kbd/files/kbd.init b/package/kbd/files/kbd.init index 99bb56b00..e495109e9 100644 --- a/package/kbd/files/kbd.init +++ b/package/kbd/files/kbd.init @@ -11,7 +11,7 @@ autostart) exec sh $0 start ;; start) - loadkeys /etc/${kbd_map}.map + loadkeys ${kbd_map} ;; stop) ;; diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index 03919ccb7..6e6e29aaa 100644 --- a/target/config/Config.in.runtime +++ b/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" |