keymaps handling moved from initscripts to keymaps package

- loading keymap require loadkeys from console-tools (which takes 300K)
- all Zaurus machines (except collie) will get this package installed
- collie 2.4 keymap is the same as kernel one so it is not needed on device
  anyway users can install it if want to make some changes in mapping
Zaurus machines conf: dropped console-tools from RDEPENDS, added keymaps instead
- keymaps RDEPEND on console-tools

24 files changed, 36 insertions, 20 deletions

diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index d9b93005f5..ed4e205519 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "makedevs"
 DEPENDS_openzaurus = "makedevs virtual/kernel"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r69"
+PR = "r70"
 
 SRC_URI = "file://halt \
            file://ramdisk \
@@ -31,18 +31,10 @@ SRC_URI = "file://halt \
            file://sysfs.sh \
            file://device_table.txt \
            file://populate-volatile.sh \
-           file://volatiles \
-           file://keymap"
+           file://volatiles "
 
 SRC_URI_append_arm          = " file://alignment.sh"
 SRC_URI_append_openzaurus   = " file://checkversion"
-SRC_URI_append_c7x0         = " file://keymap-*.map"
-SRC_URI_append_tosa         = " file://keymap-*.map"
-SRC_URI_append_akita        = " file://keymap-*.map"
-SRC_URI_append_spitz        = " file://keymap-*.map"
-SRC_URI_append_borzoi       = " file://keymap-*.map"
-SRC_URI_append_collie       = " file://keymap-*.map"
-SRC_URI_append_poodle       = " file://keymap-*.map"
 
 def read_kernel_version(d):
 	import bb
@@ -104,16 +96,6 @@ do_install () {
 		ln -sf		../init.d/checkversion  ${D}${sysconfdir}/rcS.d/S01version
 	fi
 
-    case ${MACHINE} in
-        c7x0 | tosa | spitz | akita | borzoi | collie | poodle )
-			install -m 0755 ${WORKDIR}/keymap		${D}${sysconfdir}/init.d
-			ln -sf	../init.d/keymap	${D}${sysconfdir}/rcS.d/S00keymap
-			install -m 0644 ${WORKDIR}/keymap-*.map	${D}${sysconfdir}
-			;;
-        *)
-			;;
-    esac
-
 	install -m 0755 ${WORKDIR}/banner	${D}${sysconfdir}/init.d/banner
 	install -m 0755 ${WORKDIR}/devices	${D}${sysconfdir}/init.d/devices
 	install -m 0755 ${WORKDIR}/umountfs	${D}${sysconfdir}/init.d/umountfs
diff --git a/packages/keymaps/.mtn2git_empty b/packages/keymaps/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/keymaps/.mtn2git_empty
diff --git a/packages/keymaps/files/.mtn2git_empty b/packages/keymaps/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/keymaps/files/.mtn2git_empty
diff --git a/packages/keymaps/files/akita/.mtn2git_empty b/packages/keymaps/files/akita/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/keymaps/files/akita/.mtn2git_empty
diff --git a/packages/initscripts/initscripts-1.0/akita/keymap-2.4.map b/packages/keymaps/files/akita/keymap-2.4.map
index e6339979e8..e6339979e8 100644
--- a/packages/initscripts/initscripts-1.0/akita/keymap-2.4.map
+++ b/packages/keymaps/files/akita/keymap-2.4.map
diff --git a/packages/initscripts/initscripts-1.0/akita/keymap-2.6.map b/packages/keymaps/files/akita/keymap-2.6.map
index 6fc3a9a9cf..6fc3a9a9cf 100644
--- a/packages/initscripts/initscripts-1.0/akita/keymap-2.6.map
+++ b/packages/keymaps/files/akita/keymap-2.6.map
diff --git a/packages/keymaps/files/borzoi/.mtn2git_empty b/packages/keymaps/files/borzoi/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/keymaps/files/borzoi/.mtn2git_empty
diff --git a/packages/initscripts/initscripts-1.0/borzoi/keymap-2.4.map b/packages/keymaps/files/borzoi/keymap-2.4.map
index e6339979e8..e6339979e8 100644
--- a/packages/initscripts/initscripts-1.0/borzoi/keymap-2.4.map
+++ b/packages/keymaps/files/borzoi/keymap-2.4.map
diff --git a/packages/initscripts/initscripts-1.0/borzoi/keymap-2.6.map b/packages/keymaps/files/borzoi/keymap-2.6.map
index 6fc3a9a9cf..6fc3a9a9cf 100644
--- a/packages/initscripts/initscripts-1.0/borzoi/keymap-2.6.map
+++ b/packages/keymaps/files/borzoi/keymap-2.6.map
diff --git a/packages/keymaps/files/c7x0/.mtn2git_empty b/packages/keymaps/files/c7x0/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/keymaps/files/c7x0/.mtn2git_empty
diff --git a/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map b/packages/keymaps/files/c7x0/keymap-2.6.map
index 6fc3a9a9cf..6fc3a9a9cf 100755..100644
--- a/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map
+++ b/packages/keymaps/files/c7x0/keymap-2.6.map
diff --git a/packages/keymaps/files/collie/.mtn2git_empty b/packages/keymaps/files/collie/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/keymaps/files/collie/.mtn2git_empty
diff --git a/packages/initscripts/initscripts-1.0/collie/keymap-2.4.map b/packages/keymaps/files/collie/keymap-2.4.map
index 4cd8325bb0..4cd8325bb0 100644
--- a/packages/initscripts/initscripts-1.0/collie/keymap-2.4.map
+++ b/packages/keymaps/files/collie/keymap-2.4.map
diff --git a/packages/initscripts/initscripts-1.0/collie/keymap-2.6.map b/packages/keymaps/files/collie/keymap-2.6.map
index 285b597c99..285b597c99 100644
--- a/packages/initscripts/initscripts-1.0/collie/keymap-2.6.map
+++ b/packages/keymaps/files/collie/keymap-2.6.map
diff --git a/packages/initscripts/initscripts-1.0/keymap b/packages/keymaps/files/keymap
index 6ebc634266..6ebc634266 100755..100644
--- a/packages/initscripts/initscripts-1.0/keymap
+++ b/packages/keymaps/files/keymap
diff --git a/packages/keymaps/files/poodle/.mtn2git_empty b/packages/keymaps/files/poodle/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/keymaps/files/poodle/.mtn2git_empty
diff --git a/packages/initscripts/initscripts-1.0/poodle/keymap-2.6.map b/packages/keymaps/files/poodle/keymap-2.6.map
index 285b597c99..285b597c99 100644
--- a/packages/initscripts/initscripts-1.0/poodle/keymap-2.6.map
+++ b/packages/keymaps/files/poodle/keymap-2.6.map
diff --git a/packages/keymaps/files/spitz/.mtn2git_empty b/packages/keymaps/files/spitz/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/keymaps/files/spitz/.mtn2git_empty
diff --git a/packages/initscripts/initscripts-1.0/spitz/keymap-2.4.map b/packages/keymaps/files/spitz/keymap-2.4.map
index e6339979e8..e6339979e8 100644
--- a/packages/initscripts/initscripts-1.0/spitz/keymap-2.4.map
+++ b/packages/keymaps/files/spitz/keymap-2.4.map
diff --git a/packages/initscripts/initscripts-1.0/spitz/keymap-2.6.map b/packages/keymaps/files/spitz/keymap-2.6.map
index 6fc3a9a9cf..6fc3a9a9cf 100644
--- a/packages/initscripts/initscripts-1.0/spitz/keymap-2.6.map
+++ b/packages/keymaps/files/spitz/keymap-2.6.map
diff --git a/packages/keymaps/files/tosa/.mtn2git_empty b/packages/keymaps/files/tosa/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/keymaps/files/tosa/.mtn2git_empty
diff --git a/packages/initscripts/initscripts-1.0/tosa/keymap-2.4.map b/packages/keymaps/files/tosa/keymap-2.4.map
index 31ca75b660..31ca75b660 100644
--- a/packages/initscripts/initscripts-1.0/tosa/keymap-2.4.map
+++ b/packages/keymaps/files/tosa/keymap-2.4.map
diff --git a/packages/initscripts/initscripts-1.0/tosa/keymap-2.6.map b/packages/keymaps/files/tosa/keymap-2.6.map
index ac43471326..ac43471326 100644
--- a/packages/initscripts/initscripts-1.0/tosa/keymap-2.6.map
+++ b/packages/keymaps/files/tosa/keymap-2.6.map
diff --git a/packages/keymaps/keymaps_1.0.bb b/packages/keymaps/keymaps_1.0.bb
new file mode 100644
index 0000000000..4df5df8113
--- /dev/null
+++ b/packages/keymaps/keymaps_1.0.bb
@@ -0,0 +1,34 @@
+DESCRIPTION = "Keyboard map"
+SECTION = "base"
+MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
+RDEPENDS = "initscripts console-tools"
+LICENSE = "GPL"
+PACKAGE_ARCH = "${MACHINE}"
+PR = "r2"
+
+inherit update-rc.d
+
+SRC_URI = "file://keymap"
+
+SRC_URI_append_c7x0         = " file://keymap-*.map"
+SRC_URI_append_tosa         = " file://keymap-*.map"
+SRC_URI_append_akita        = " file://keymap-*.map"
+SRC_URI_append_spitz        = " file://keymap-*.map"
+SRC_URI_append_collie       = " file://keymap-*.map"
+SRC_URI_append_poodle       = " file://keymap-*.map"
+
+INITSCRIPT_NAME = "keymap"
+INITSCRIPT_PARAMS = "start 00 S ."
+
+do_install () {
+    install -d ${D}${sysconfdir}/init.d/
+    install -m 0755 ${WORKDIR}/keymap ${D}${sysconfdir}/init.d/
+
+    case ${MACHINE} in
+        c7x0 | tosa | spitz | akita | borzoi | collie | poodle )
+            install -m 0644 ${WORKDIR}/keymap-*.map	${D}${sysconfdir}
+            ;;
+        *)
+            ;;
+    esac
+}