28 files changed, 40 insertions, 24 deletions
diff --git a/conf/machine/include/poodle-2.6.conf b/conf/machine/include/poodle-2.6.conf
index b1dcd7fe3b..9076355522 100644
--- a/conf/machine/include/poodle-2.6.conf
+++ b/conf/machine/include/poodle-2.6.conf
@@ -3,7 +3,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
 PCMCIA_MANAGER ?= "pcmciautils"
 
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \
-${PCMCIA_MANAGER} apm  wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \
+${PCMCIA_MANAGER} apm  wireless-tools irda-utils udev-utils keymaps hostap-utils prism3-firmware prism3-support \
 ppp ppp-dialin alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf zaurusd"
 
 # Ethernet modules
diff --git a/conf/machine/include/tosa-2.4.conf b/conf/machine/include/tosa-2.4.conf
index 88df07cddb..068d8c4677 100644
--- a/conf/machine/include/tosa-2.4.conf
+++ b/conf/machine/include/tosa-2.4.conf
@@ -4,7 +4,7 @@ PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa"
 # Later versions are broken on kernel 2.4
 PREFERRED_VERSION_orinoco-modules = "0.13e"
 
-BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils console-tools \
+BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils keymaps \
 				kernel-module-acm \
 				kernel-module-evdev kernel-module-net-fd \
 				kernel-module-pxa-bi kernel-module-registers \
diff --git a/conf/machine/include/zaurus-clamshell-2.4.conf b/conf/machine/include/zaurus-clamshell-2.4.conf
index af66c7294e..b2ca8370e7 100644
--- a/conf/machine/include/zaurus-clamshell-2.4.conf
+++ b/conf/machine/include/zaurus-clamshell-2.4.conf
@@ -10,7 +10,7 @@ PREFERRED_PROVIDERS_append_borzoi = " virtual/kernel:openzaurus-pxa27x"
 PREFERRED_VERSION_orinoco-modules = "0.13e"
 
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support \
-pcmcia-cs apmd apm wireless-tools console-tools irda-utils hostap-utils prism3-firmware prism3-support \
+pcmcia-cs apmd apm wireless-tools keymaps irda-utils hostap-utils prism3-firmware prism3-support \
 wpa-supplicant-nossl ppp ppp-dialin openswan"
 
 # Misc Modules
diff --git a/conf/machine/include/zaurus-clamshell-2.6.conf b/conf/machine/include/zaurus-clamshell-2.6.conf
index e73028d7ee..95f3c528e8 100644
--- a/conf/machine/include/zaurus-clamshell-2.6.conf
+++ b/conf/machine/include/zaurus-clamshell-2.6.conf
@@ -7,7 +7,7 @@ PREFERRED_VERSION_wpa_supplicant = "0.4.7"
 PCMCIA_MANAGER ?= "pcmciautils"
 
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \
-${PCMCIA_MANAGER} apm  wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \
+${PCMCIA_MANAGER} apm  wireless-tools irda-utils udev-utils keymaps hostap-utils prism3-firmware prism3-support \
 ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf zaurusd"
 
 # Ethernet modules
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
+}