Skip to contentSkip to conversation

keymaps: edit script to reuse 2.6 kernel keymaps

PATCH Applied Andrea Adami 3 participants 3 messages Mar 18, 2012 – Mar 25, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 keymaps: edit script to reuse 2.6 kernel keymaps

* The keymap.sh script installed by oe-core recipe has a check
* for KERNEL_MAJMIN=uname -r | cut -d '.' -f 1,2
* so the keymaps-2.6.map's are ignored when running 3.x kernels
* Thus, we replace the suffix of the runtime kernel with "2.6" in the .bbappend.
* Bump PR

---
 recipes-bsp/keymaps/keymaps_1.0.bbappend |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
recipes-bsp/keymaps/keymaps_1.0.bbappend +6 -1
index d3310c1..039b30c 100644
@@ -1,4 +1,4 @@
-PRINC = "1"
+PRINC = "2"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
@@ -20,6 +20,11 @@ SRC_URI_append_jornada6xx   = " file://keymap-uk-620-660.map \
 				file://keymap-uk.map \
 				"
 
+# we still use keymap-2.6.map files
+do_configure_append () {
+    sed -i -e 's/KERNEL_MAJMIN=.*$/KERNEL_MAJMIN="2.6"/' ${WORKDIR}/keymap.sh
+}
+
 do_install_append () {
     case ${MACHINE} in
         c7x0 | tosa | akita | spitz | collie | poodle | h2200 | h4000 | hx4700 | jornada6xx )
Signature · 1 line
1.7.3.4
#1 lore raw
Quoted 5 lines · Andrea Adami

* The keymap.sh script installed by oe-core recipe has a check
* for KERNEL_MAJMIN=uname -r | cut -d '.' -f 1,2
* so the keymaps-2.6.map's are ignored when running 3.x kernels
* Thus, we replace the suffix of the runtime kernel with "2.6" in the .bbappend.
* Bump PR

Anyone interested in systemd support for keymaps?
Here is .bbappend and .service I'm using:

meta-smartphone/meta-shr/recipes-bsp/keymaps/

And it's also assuming keymaps-2.6.map file.

Cheers,

Quoted 36 lines
---
 recipes-bsp/keymaps/keymaps_1.0.bbappend |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
recipes-bsp/keymaps/keymaps_1.0.bbappend +6 -1
index d3310c1..039b30c 100644
@@ -1,4 +1,4 @@
-PRINC = "1"
+PRINC = "2"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
@@ -20,6 +20,11 @@ SRC_URI_append_jornada6xx   = " file://keymap-uk-620-660.map \
 				file://keymap-uk.map \
 				"
 
+# we still use keymap-2.6.map files
+do_configure_append () {
+    sed -i -e 's/KERNEL_MAJMIN=.*$/KERNEL_MAJMIN="2.6"/' ${WORKDIR}/keymap.sh
+}
+
 do_install_append () {
     case ${MACHINE} in
         c7x0 | tosa | akita | spitz | collie | poodle | h2200 | h4000 | hx4700 | jornada6xx )
Signature · 7 lines
1.7.3.4


_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#2 lore raw
In reply to Andrea Adami
Quoted 33 lines · On Sunday 18 March 2012 01:13:55 Andrea Adami wrote:

* The keymap.sh script installed by oe-core recipe has a check
* for KERNEL_MAJMIN=uname -r | cut -d '.' -f 1,2
* so the keymaps-2.6.map's are ignored when running 3.x kernels
* Thus, we replace the suffix of the runtime kernel with "2.6" in the .bbappend. * Bump PR

---
 recipes-bsp/keymaps/keymaps_1.0.bbappend |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
(quoted diff) +0 -0

b/recipes-bsp/keymaps/keymaps_1.0.bbappend index d3310c1..039b30c 100644

recipes-bsp/keymaps/keymaps_1.0.bbappend +5 -1
@@ -1,4 +1,4 @@
-PRINC = "1"
+PRINC = "2"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
@@ -20,6 +20,11 @@ SRC_URI_append_jornada6xx   = "
 file://keymap-uk-620-660.map \ file://keymap-uk.map \
 				"
 
+# we still use keymap-2.6.map files
+do_configure_append () {
+    sed -i -e 's/KERNEL_MAJMIN=.*$/KERNEL_MAJMIN="2.6"/'
 ${WORKDIR}/keymap.sh +}
+
 do_install_append () {
     case ${MACHINE} in
         c7x0 | tosa | akita | spitz | collie | poodle | h2200 | h4000 |
Quoted 1 line

hx4700 | jornada6xx )

Merged to meta-handheld master, thanks.

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre