From ddf840bda3e98eff84c09083edf2706c65ec683f Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 7 Apr 2006 15:32:51 +0000 Subject: [PATCH] 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 --- conf/machine/include/poodle-2.6.conf | 2 +- conf/machine/include/tosa-2.4.conf | 2 +- .../machine/include/zaurus-clamshell-2.4.conf | 2 +- .../machine/include/zaurus-clamshell-2.6.conf | 2 +- packages/initscripts/initscripts_1.0.bb | 22 ++---------- packages/keymaps/.mtn2git_empty | 0 packages/keymaps/files/.mtn2git_empty | 0 packages/keymaps/files/akita/.mtn2git_empty | 0 .../files}/akita/keymap-2.4.map | 0 .../files}/akita/keymap-2.6.map | 0 packages/keymaps/files/borzoi/.mtn2git_empty | 0 .../files}/borzoi/keymap-2.4.map | 0 .../files}/borzoi/keymap-2.6.map | 0 packages/keymaps/files/c7x0/.mtn2git_empty | 0 .../files}/c7x0/keymap-2.6.map | 0 packages/keymaps/files/collie/.mtn2git_empty | 0 .../files}/collie/keymap-2.4.map | 0 .../files}/collie/keymap-2.6.map | 0 .../initscripts-1.0 => keymaps/files}/keymap | 0 packages/keymaps/files/poodle/.mtn2git_empty | 0 .../files}/poodle/keymap-2.6.map | 0 packages/keymaps/files/spitz/.mtn2git_empty | 0 .../files}/spitz/keymap-2.4.map | 0 .../files}/spitz/keymap-2.6.map | 0 packages/keymaps/files/tosa/.mtn2git_empty | 0 .../files}/tosa/keymap-2.4.map | 0 .../files}/tosa/keymap-2.6.map | 0 packages/keymaps/keymaps_1.0.bb | 34 +++++++++++++++++++ 28 files changed, 40 insertions(+), 24 deletions(-) create mode 100644 packages/keymaps/.mtn2git_empty create mode 100644 packages/keymaps/files/.mtn2git_empty create mode 100644 packages/keymaps/files/akita/.mtn2git_empty rename packages/{initscripts/initscripts-1.0 => keymaps/files}/akita/keymap-2.4.map (100%) rename packages/{initscripts/initscripts-1.0 => keymaps/files}/akita/keymap-2.6.map (100%) create mode 100644 packages/keymaps/files/borzoi/.mtn2git_empty rename packages/{initscripts/initscripts-1.0 => keymaps/files}/borzoi/keymap-2.4.map (100%) rename packages/{initscripts/initscripts-1.0 => keymaps/files}/borzoi/keymap-2.6.map (100%) create mode 100644 packages/keymaps/files/c7x0/.mtn2git_empty rename packages/{initscripts/initscripts-1.0 => keymaps/files}/c7x0/keymap-2.6.map (100%) mode change 100755 => 100644 create mode 100644 packages/keymaps/files/collie/.mtn2git_empty rename packages/{initscripts/initscripts-1.0 => keymaps/files}/collie/keymap-2.4.map (100%) rename packages/{initscripts/initscripts-1.0 => keymaps/files}/collie/keymap-2.6.map (100%) rename packages/{initscripts/initscripts-1.0 => keymaps/files}/keymap (100%) mode change 100755 => 100644 create mode 100644 packages/keymaps/files/poodle/.mtn2git_empty rename packages/{initscripts/initscripts-1.0 => keymaps/files}/poodle/keymap-2.6.map (100%) create mode 100644 packages/keymaps/files/spitz/.mtn2git_empty rename packages/{initscripts/initscripts-1.0 => keymaps/files}/spitz/keymap-2.4.map (100%) rename packages/{initscripts/initscripts-1.0 => keymaps/files}/spitz/keymap-2.6.map (100%) create mode 100644 packages/keymaps/files/tosa/.mtn2git_empty rename packages/{initscripts/initscripts-1.0 => keymaps/files}/tosa/keymap-2.4.map (100%) rename packages/{initscripts/initscripts-1.0 => keymaps/files}/tosa/keymap-2.6.map (100%) create mode 100644 packages/keymaps/keymaps_1.0.bb 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 diff --git a/packages/keymaps/files/.mtn2git_empty b/packages/keymaps/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/keymaps/files/akita/.mtn2git_empty b/packages/keymaps/files/akita/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/initscripts/initscripts-1.0/akita/keymap-2.4.map b/packages/keymaps/files/akita/keymap-2.4.map similarity index 100% rename from packages/initscripts/initscripts-1.0/akita/keymap-2.4.map rename to 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 similarity index 100% rename from packages/initscripts/initscripts-1.0/akita/keymap-2.6.map rename to 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 diff --git a/packages/initscripts/initscripts-1.0/borzoi/keymap-2.4.map b/packages/keymaps/files/borzoi/keymap-2.4.map similarity index 100% rename from packages/initscripts/initscripts-1.0/borzoi/keymap-2.4.map rename to 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 similarity index 100% rename from packages/initscripts/initscripts-1.0/borzoi/keymap-2.6.map rename to 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 diff --git a/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map b/packages/keymaps/files/c7x0/keymap-2.6.map old mode 100755 new mode 100644 similarity index 100% rename from packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map rename to 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 diff --git a/packages/initscripts/initscripts-1.0/collie/keymap-2.4.map b/packages/keymaps/files/collie/keymap-2.4.map similarity index 100% rename from packages/initscripts/initscripts-1.0/collie/keymap-2.4.map rename to 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 similarity index 100% rename from packages/initscripts/initscripts-1.0/collie/keymap-2.6.map rename to packages/keymaps/files/collie/keymap-2.6.map diff --git a/packages/initscripts/initscripts-1.0/keymap b/packages/keymaps/files/keymap old mode 100755 new mode 100644 similarity index 100% rename from packages/initscripts/initscripts-1.0/keymap rename to 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 diff --git a/packages/initscripts/initscripts-1.0/poodle/keymap-2.6.map b/packages/keymaps/files/poodle/keymap-2.6.map similarity index 100% rename from packages/initscripts/initscripts-1.0/poodle/keymap-2.6.map rename to 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 diff --git a/packages/initscripts/initscripts-1.0/spitz/keymap-2.4.map b/packages/keymaps/files/spitz/keymap-2.4.map similarity index 100% rename from packages/initscripts/initscripts-1.0/spitz/keymap-2.4.map rename to 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 similarity index 100% rename from packages/initscripts/initscripts-1.0/spitz/keymap-2.6.map rename to 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 diff --git a/packages/initscripts/initscripts-1.0/tosa/keymap-2.4.map b/packages/keymaps/files/tosa/keymap-2.4.map similarity index 100% rename from packages/initscripts/initscripts-1.0/tosa/keymap-2.4.map rename to 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 similarity index 100% rename from packages/initscripts/initscripts-1.0/tosa/keymap-2.6.map rename to 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 " +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 +} -- 2.39.5