summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xmeta/recipes-bsp/formfactor/files/akita/machconfig15
-rw-r--r--meta/recipes-bsp/formfactor/files/atom-pc/machconfig6
-rwxr-xr-xmeta/recipes-bsp/formfactor/files/beagleboard/machconfig3
-rw-r--r--meta/recipes-bsp/formfactor/files/bootcdx86/machconfig5
-rwxr-xr-xmeta/recipes-bsp/formfactor/files/c7x0/machconfig15
-rwxr-xr-xmeta/recipes-bsp/formfactor/files/cm-x270/machconfig9
-rwxr-xr-xmeta/recipes-bsp/formfactor/files/em-x270/machconfig15
-rwxr-xr-xmeta/recipes-bsp/formfactor/files/htcuniversal/machconfig15
-rwxr-xr-xmeta/recipes-bsp/formfactor/files/igep0020/machconfig3
-rwxr-xr-xmeta/recipes-bsp/formfactor/files/nokia800/machconfig13
-rw-r--r--meta/recipes-bsp/formfactor/files/om-gta01/machconfig14
-rwxr-xr-xmeta/recipes-bsp/formfactor/files/omap-3430ldp/machconfig15
-rwxr-xr-xmeta/recipes-bsp/formfactor/files/omap-3430sdp/machconfig15
-rwxr-xr-xmeta/recipes-bsp/formfactor/files/spitz/machconfig15
-rwxr-xr-xmeta/recipes-bsp/formfactor/files/zylonite/machconfig12
-rw-r--r--meta/recipes-bsp/keymaps/files/akita/keymap-2.4.map128
-rw-r--r--meta/recipes-bsp/keymaps/files/akita/keymap-2.6.map228
-rwxr-xr-xmeta/recipes-bsp/keymaps/files/c7x0/keymap-2.6.map213
-rw-r--r--meta/recipes-bsp/keymaps/files/collie/keymap-2.4.map114
-rw-r--r--meta/recipes-bsp/keymaps/files/collie/keymap-2.6.map262
-rw-r--r--meta/recipes-bsp/keymaps/files/h2200/keymap-2.6.map17
-rw-r--r--meta/recipes-bsp/keymaps/files/htcuniversal/keymap-2.6.map20
-rw-r--r--meta/recipes-bsp/keymaps/files/jornada6xx/keymap-de.map597
-rw-r--r--meta/recipes-bsp/keymaps/files/jornada6xx/keymap-sp.map222
-rw-r--r--meta/recipes-bsp/keymaps/files/jornada6xx/keymap-uk.map278
-rw-r--r--meta/recipes-bsp/keymaps/files/poodle/keymap-2.6.map152
-rw-r--r--meta/recipes-bsp/keymaps/files/spitz/keymap-2.4.map128
-rw-r--r--meta/recipes-bsp/keymaps/files/spitz/keymap-2.6.map228
-rw-r--r--meta/recipes-bsp/keymaps/files/tosa/keymap-2.4.map133
-rw-r--r--meta/recipes-bsp/keymaps/files/tosa/keymap-2.6.map210
-rw-r--r--meta/recipes-bsp/keymaps/keymaps_1.0.bb20
-rw-r--r--meta/recipes-bsp/pointercal/files/akita/pointercal1
-rw-r--r--meta/recipes-bsp/pointercal/files/c7x0/pointercal1
-rw-r--r--meta/recipes-bsp/pointercal/files/htcuniversal/pointercal1
-rw-r--r--meta/recipes-bsp/pointercal/files/om-gta01/pointercal1
-rw-r--r--meta/recipes-bsp/pointercal/files/omap-3430ldp/pointercal1
-rw-r--r--meta/recipes-bsp/pointercal/files/spitz/pointercal1
-rw-r--r--meta/recipes-core/base-files/base-files/akita/fstab16
-rw-r--r--meta/recipes-core/base-files/base-files/akita/rotation1
-rw-r--r--meta/recipes-core/base-files/base-files/c7x0/fstab12
-rw-r--r--meta/recipes-core/base-files/base-files/c7x0/usbd1
-rw-r--r--meta/recipes-core/base-files/base-files/collie/fstab8
-rw-r--r--meta/recipes-core/base-files/base-files/collie/usbd1
-rw-r--r--meta/recipes-core/base-files/base-files/htcuniversal/rotation1
-rw-r--r--meta/recipes-core/base-files/base-files/hx2000/fstab9
-rw-r--r--meta/recipes-core/base-files/base-files/mtx-1/fstab8
-rw-r--r--meta/recipes-core/base-files/base-files/mtx-1/profile25
-rw-r--r--meta/recipes-core/base-files/base-files/nokia770/fstab6
-rw-r--r--meta/recipes-core/base-files/base-files/poodle/fstab13
-rw-r--r--meta/recipes-core/base-files/base-files/poodle/usbd1
-rw-r--r--meta/recipes-core/base-files/base-files/spitz/fstab28
-rw-r--r--meta/recipes-core/base-files/base-files/spitz/rotation1
-rw-r--r--meta/recipes-core/base-files/base-files/tosa/fstab12
-rw-r--r--meta/recipes-core/base-files/base-files/tosa/usbd5
-rw-r--r--meta/recipes-core/base-files/base-files_3.0.14.bb17
-rw-r--r--meta/recipes-core/netbase/netbase-4.45/epia/interfaces10
-rw-r--r--meta/recipes-core/netbase/netbase-4.45/mtx-1/interfaces29
-rw-r--r--meta/recipes-core/netbase/netbase-4.45/nokia800/interfaces5
-rw-r--r--meta/recipes-core/netbase/netbase-4.45/tosa/interfaces24
-rw-r--r--meta/recipes-core/netbase/netbase-4.45/wrt54/interfaces23
-rw-r--r--meta/recipes-core/netbase/netbase-4.45/xxs1500/interfaces15
-rw-r--r--meta/recipes-core/netbase/netbase_4.45.bb5
-rw-r--r--meta/recipes-core/tasks/task-core-tools.bb2
-rw-r--r--meta/recipes-core/uclibc/uclibc-0.9.30.1/akita/uClibc.machine70
-rw-r--r--meta/recipes-core/uclibc/uclibc-0.9.30.1/atom-pc/uClibc.machine69
-rw-r--r--meta/recipes-core/uclibc/uclibc-0.9.30.1/c7x0/uClibc.machine70
-rw-r--r--meta/recipes-core/uclibc/uclibc-0.9.30.1/cm-x270/uClibc.machine70
-rw-r--r--meta/recipes-core/uclibc/uclibc-0.9.30.1/om-gta01/uClibc.machine69
-rw-r--r--meta/recipes-core/uclibc/uclibc-0.9.30.1/spitz/uClibc.machine70
-rw-r--r--meta/recipes-core/udev/files/50-hostap_cs.rules4
-rw-r--r--meta/recipes-core/udev/files/akita/mount.blacklist3
-rw-r--r--meta/recipes-core/udev/files/c7x0/mount.blacklist3
-rw-r--r--meta/recipes-core/udev/files/spitz/mount.blacklist4
-rw-r--r--meta/recipes-core/udev/files/tosa/mount.blacklist3
-rw-r--r--meta/recipes-core/udev/udev-new.inc7
-rw-r--r--meta/recipes-core/udev/udev_145.bb9
-rw-r--r--meta/recipes-core/udev/udev_164.bb2
-rw-r--r--meta/recipes-gnome/tasks/task-sdk-gmae.inc2
-rw-r--r--meta/recipes-graphics/clutter/clutter-1.4_1.4.2.bb2
-rw-r--r--meta/recipes-graphics/clutter/clutter-1.6_1.6.14.bb2
-rw-r--r--meta/recipes-graphics/clutter/clutter.inc35
-rw-r--r--meta/recipes-graphics/clutter/clutter_git.bb2
-rw-r--r--meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb3
-rw-r--r--meta/recipes-graphics/mesa/mesa-dri_git.bb3
-rw-r--r--meta/recipes-graphics/mutter/mutter.inc3
-rw-r--r--meta/recipes-graphics/tslib/tslib/a780/tslib.sh6
-rw-r--r--meta/recipes-graphics/tslib/tslib/collie/ts.conf5
-rw-r--r--meta/recipes-graphics/tslib/tslib/collie/tslib.sh13
-rw-r--r--meta/recipes-graphics/tslib/tslib/devfs.patch18
-rw-r--r--meta/recipes-graphics/tslib/tslib/e680/tslib.sh6
-rw-r--r--meta/recipes-graphics/tslib/tslib/event1.patch80
-rw-r--r--meta/recipes-graphics/tslib/tslib/jornada56x/ts.conf5
-rw-r--r--meta/recipes-graphics/tslib/tslib/jornada56x/tslib.sh5
-rw-r--r--meta/recipes-graphics/tslib/tslib/jornada6xx/ts.conf5
-rw-r--r--meta/recipes-graphics/tslib/tslib/jornada6xx/tslib.sh5
-rw-r--r--meta/recipes-graphics/tslib/tslib/jornada7xx/ts.conf5
-rw-r--r--meta/recipes-graphics/tslib/tslib/jornada7xx/tslib.sh5
-rw-r--r--meta/recipes-graphics/tslib/tslib/mnci/ts.conf5
-rw-r--r--meta/recipes-graphics/tslib/tslib/mnci/tslib.sh1
-rw-r--r--meta/recipes-graphics/tslib/tslib/netbook-pro/ts.conf5
-rw-r--r--meta/recipes-graphics/tslib/tslib/netbook-pro/tslib.sh5
-rw-r--r--meta/recipes-graphics/tslib/tslib/omap1610h2/tslib.sh5
-rw-r--r--meta/recipes-graphics/tslib/tslib/omap5912osk/tslib.sh4
-rw-r--r--meta/recipes-graphics/tslib/tslib/simpad/tslib.sh14
-rw-r--r--meta/recipes-graphics/tslib/tslib/ts.conf-collie-2.45
-rw-r--r--meta/recipes-graphics/tslib/tslib/ts.conf-simpad-2.45
-rw-r--r--meta/recipes-graphics/tslib/tslib_1.0.bb32
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xf86-config/atom-pc/xorg.conf26
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xf86-config/igep0020/xorg.conf47
-rw-r--r--meta/recipes-kernel/modutils/files/ipaq-pxa-2.6/modules18
-rw-r--r--meta/recipes-kernel/modutils/files/ipaq-pxa-2.6/modules.conf1
-rw-r--r--meta/recipes-kernel/modutils/files/mnci/modules1
-rw-r--r--meta/recipes-kernel/modutils/files/mnci/modules-ramses1
-rw-r--r--meta/recipes-kernel/modutils/files/mnci/modules.conf20
-rwxr-xr-xmeta/recipes-kernel/modutils/files/mnci/modutils.sh10
-rw-r--r--meta/recipes-kernel/modutils/files/mtx-1/modules3
-rw-r--r--meta/recipes-kernel/modutils/files/omap1610h2/modules0
-rw-r--r--meta/recipes-kernel/modutils/files/omap1610h2/modules.conf0
-rw-r--r--meta/recipes-kernel/modutils/files/poodle/modules3
-rw-r--r--meta/recipes-kernel/modutils/files/poodle/modules.conf4
-rw-r--r--meta/recipes-kernel/modutils/files/tosa/modules4
-rw-r--r--meta/recipes-kernel/modutils/files/tosa/modules.conf4
-rw-r--r--meta/recipes-kernel/modutils/files/wrt54/modules4
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.22.bb4
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free.inc4
-rw-r--r--meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb8
-rw-r--r--meta/recipes-support/hal/hal.inc1
-rw-r--r--meta/recipes-support/hal/hal_0.5.14.bb2
-rw-r--r--meta/recipes-support/hal/hal_git.bb2
129 files changed, 13 insertions, 4302 deletions
diff --git a/meta/recipes-bsp/formfactor/files/akita/machconfig b/meta/recipes-bsp/formfactor/files/akita/machconfig
deleted file mode 100755
index a9649e03bc..0000000000
--- a/meta/recipes-bsp/formfactor/files/akita/machconfig
+++ /dev/null
@@ -1,15 +0,0 @@
1HAVE_TOUCHSCREEN=1
2HAVE_KEYBOARD=1
3HAVE_KEYBOARD_PORTRAIT=0
4HAVE_KEYBOARD_LANDSCAPE=1
5
6DISPLAY_CAN_ROTATE=1
7DISPLAY_ORIENTATION=270
8DISPLAY_WIDTH_PIXELS=480
9DISPLAY_WIDTH_MM=56
10DISPLAY_HEIGHT_PIXELS=640
11DISPLAY_HEIGHT_MM=74
12DISPLAY_BPP=16
13#DISPLAY_DPI=220
14DISPLAY_DPI=150
15DISPLAY_SUBPIXEL_ORDER=rgb
diff --git a/meta/recipes-bsp/formfactor/files/atom-pc/machconfig b/meta/recipes-bsp/formfactor/files/atom-pc/machconfig
deleted file mode 100644
index bef4ce3c9b..0000000000
--- a/meta/recipes-bsp/formfactor/files/atom-pc/machconfig
+++ /dev/null
@@ -1,6 +0,0 @@
1HAVE_TOUCHSCREEN=0
2HAVE_KEYBOARD=1
3
4DISPLAY_CAN_ROTATE=0
5DISPLAY_ORIENTATION=0
6DISPLAY_DPI=133
diff --git a/meta/recipes-bsp/formfactor/files/beagleboard/machconfig b/meta/recipes-bsp/formfactor/files/beagleboard/machconfig
deleted file mode 100755
index a46859f139..0000000000
--- a/meta/recipes-bsp/formfactor/files/beagleboard/machconfig
+++ /dev/null
@@ -1,3 +0,0 @@
1# Assume a USB mouse and touchscreen are connected
2HAVE_TOUCHSCREEN=0
3HAVE_KEYBOARD=1
diff --git a/meta/recipes-bsp/formfactor/files/bootcdx86/machconfig b/meta/recipes-bsp/formfactor/files/bootcdx86/machconfig
deleted file mode 100644
index adf707ee82..0000000000
--- a/meta/recipes-bsp/formfactor/files/bootcdx86/machconfig
+++ /dev/null
@@ -1,5 +0,0 @@
1HAVE_TOUCHSCREEN=0
2HAVE_KEYBOARD=1
3
4DISPLAY_CAN_ROTATE=0
5DISPLAY_ORIENTATION=0
diff --git a/meta/recipes-bsp/formfactor/files/c7x0/machconfig b/meta/recipes-bsp/formfactor/files/c7x0/machconfig
deleted file mode 100755
index ad3620f8fb..0000000000
--- a/meta/recipes-bsp/formfactor/files/c7x0/machconfig
+++ /dev/null
@@ -1,15 +0,0 @@
1HAVE_TOUCHSCREEN=1
2HAVE_KEYBOARD=1
3HAVE_KEYBOARD_PORTRAIT=0
4HAVE_KEYBOARD_LANDSCAPE=1
5
6DISPLAY_CAN_ROTATE=1
7DISPLAY_ORIENTATION=0
8DISPLAY_WIDTH_PIXELS=640
9DISPLAY_WIDTH_MM=74
10DISPLAY_HEIGHT_PIXELS=480
11DISPLAY_HEIGHT_MM=56
12DISPLAY_BPP=16
13#DISPLAY_DPI=220
14DISPLAY_DPI=150
15DISPLAY_SUBPIXEL_ORDER=rgb
diff --git a/meta/recipes-bsp/formfactor/files/cm-x270/machconfig b/meta/recipes-bsp/formfactor/files/cm-x270/machconfig
deleted file mode 100755
index f7387295ee..0000000000
--- a/meta/recipes-bsp/formfactor/files/cm-x270/machconfig
+++ /dev/null
@@ -1,9 +0,0 @@
1HAVE_TOUCHSCREEN=0
2HAVE_KEYBOARD=1
3
4DISPLAY_CAN_ROTATE=0
5DISPLAY_ORIENTATION=0
6DISPLAY_WIDTH_PIXELS=640
7DISPLAY_HEIGHT_PIXELS=480
8DISPLAY_BPP=16
9DISPLAY_DPI=150
diff --git a/meta/recipes-bsp/formfactor/files/em-x270/machconfig b/meta/recipes-bsp/formfactor/files/em-x270/machconfig
deleted file mode 100755
index 651e59e12c..0000000000
--- a/meta/recipes-bsp/formfactor/files/em-x270/machconfig
+++ /dev/null
@@ -1,15 +0,0 @@
1HAVE_TOUCHSCREEN=1
2HAVE_KEYBOARD=0
3HAVE_KEYBOARD_PORTRAIT=0
4HAVE_KEYBOARD_LANDSCAPE=0
5
6DISPLAY_CAN_ROTATE=1
7DISPLAY_ORIENTATION=270
8DISPLAY_WIDTH_PIXELS=480
9DISPLAY_WIDTH_MM=56
10DISPLAY_HEIGHT_PIXELS=640
11DISPLAY_HEIGHT_MM=74
12DISPLAY_BPP=16
13# This is a lie
14DISPLAY_DPI=150
15DISPLAY_SUBPIXEL_ORDER=rgb
diff --git a/meta/recipes-bsp/formfactor/files/htcuniversal/machconfig b/meta/recipes-bsp/formfactor/files/htcuniversal/machconfig
deleted file mode 100755
index a9649e03bc..0000000000
--- a/meta/recipes-bsp/formfactor/files/htcuniversal/machconfig
+++ /dev/null
@@ -1,15 +0,0 @@
1HAVE_TOUCHSCREEN=1
2HAVE_KEYBOARD=1
3HAVE_KEYBOARD_PORTRAIT=0
4HAVE_KEYBOARD_LANDSCAPE=1
5
6DISPLAY_CAN_ROTATE=1
7DISPLAY_ORIENTATION=270
8DISPLAY_WIDTH_PIXELS=480
9DISPLAY_WIDTH_MM=56
10DISPLAY_HEIGHT_PIXELS=640
11DISPLAY_HEIGHT_MM=74
12DISPLAY_BPP=16
13#DISPLAY_DPI=220
14DISPLAY_DPI=150
15DISPLAY_SUBPIXEL_ORDER=rgb
diff --git a/meta/recipes-bsp/formfactor/files/igep0020/machconfig b/meta/recipes-bsp/formfactor/files/igep0020/machconfig
deleted file mode 100755
index ffce012270..0000000000
--- a/meta/recipes-bsp/formfactor/files/igep0020/machconfig
+++ /dev/null
@@ -1,3 +0,0 @@
1# Assume a USB mouse and keyboard are connected
2HAVE_TOUCHSCREEN=0
3HAVE_KEYBOARD=1
diff --git a/meta/recipes-bsp/formfactor/files/nokia800/machconfig b/meta/recipes-bsp/formfactor/files/nokia800/machconfig
deleted file mode 100755
index ebe626c305..0000000000
--- a/meta/recipes-bsp/formfactor/files/nokia800/machconfig
+++ /dev/null
@@ -1,13 +0,0 @@
1HAVE_TOUCHSCREEN=1
2HAVE_KEYBOARD=0
3
4DISPLAY_CAN_ROTATE=0
5DISPLAY_ORIENTATION=0
6DISPLAY_WIDTH_PIXELS=800
7DISPLAY_WIDTH_MM=90
8DISPLAY_HEIGHT_PIXELS=480
9DISPLAY_HEIGHT_MM=54
10DISPLAY_BPP=16
11#DISPLAY_DPI=220
12DISPLAY_DPI=150
13#DISPLAY_SUBPIXEL_ORDER=
diff --git a/meta/recipes-bsp/formfactor/files/om-gta01/machconfig b/meta/recipes-bsp/formfactor/files/om-gta01/machconfig
deleted file mode 100644
index 38a9bb0be0..0000000000
--- a/meta/recipes-bsp/formfactor/files/om-gta01/machconfig
+++ /dev/null
@@ -1,14 +0,0 @@
1HAVE_TOUCHSCREEN=1
2HAVE_KEYBOARD=0
3HAVE_KEYBOARD_PORTRAIT=0
4HAVE_KEYBOARD_LANDSCAPE=0
5
6DISPLAY_CAN_ROTATE=1
7DISPLAY_ORIENTATION=270
8DISPLAY_WIDTH_PIXELS=480
9DISPLAY_WIDTH_MM=74
10DISPLAY_HEIGHT_PIXELS=640
11DISPLAY_HEIGHT_MM=56
12DISPLAY_BPP=16
13DISPLAY_DPI=280
14DISPLAY_SUBPIXEL_ORDER=rgb
diff --git a/meta/recipes-bsp/formfactor/files/omap-3430ldp/machconfig b/meta/recipes-bsp/formfactor/files/omap-3430ldp/machconfig
deleted file mode 100755
index 341ae1cf8f..0000000000
--- a/meta/recipes-bsp/formfactor/files/omap-3430ldp/machconfig
+++ /dev/null
@@ -1,15 +0,0 @@
1HAVE_TOUCHSCREEN=1
2HAVE_KEYBOARD=0
3HAVE_KEYBOARD_PORTRAIT=0
4HAVE_KEYBOARD_LANDSCAPE=0
5
6DISPLAY_CAN_ROTATE=1
7DISPLAY_ORIENTATION=0
8DISPLAY_WIDTH_PIXELS=480
9DISPLAY_WIDTH_MM=56
10DISPLAY_HEIGHT_PIXELS=640
11DISPLAY_HEIGHT_MM=74
12DISPLAY_BPP=16
13#DISPLAY_DPI=220
14DISPLAY_DPI=150
15DISPLAY_SUBPIXEL_ORDER=rgb
diff --git a/meta/recipes-bsp/formfactor/files/omap-3430sdp/machconfig b/meta/recipes-bsp/formfactor/files/omap-3430sdp/machconfig
deleted file mode 100755
index 341ae1cf8f..0000000000
--- a/meta/recipes-bsp/formfactor/files/omap-3430sdp/machconfig
+++ /dev/null
@@ -1,15 +0,0 @@
1HAVE_TOUCHSCREEN=1
2HAVE_KEYBOARD=0
3HAVE_KEYBOARD_PORTRAIT=0
4HAVE_KEYBOARD_LANDSCAPE=0
5
6DISPLAY_CAN_ROTATE=1
7DISPLAY_ORIENTATION=0
8DISPLAY_WIDTH_PIXELS=480
9DISPLAY_WIDTH_MM=56
10DISPLAY_HEIGHT_PIXELS=640
11DISPLAY_HEIGHT_MM=74
12DISPLAY_BPP=16
13#DISPLAY_DPI=220
14DISPLAY_DPI=150
15DISPLAY_SUBPIXEL_ORDER=rgb
diff --git a/meta/recipes-bsp/formfactor/files/spitz/machconfig b/meta/recipes-bsp/formfactor/files/spitz/machconfig
deleted file mode 100755
index a9649e03bc..0000000000
--- a/meta/recipes-bsp/formfactor/files/spitz/machconfig
+++ /dev/null
@@ -1,15 +0,0 @@
1HAVE_TOUCHSCREEN=1
2HAVE_KEYBOARD=1
3HAVE_KEYBOARD_PORTRAIT=0
4HAVE_KEYBOARD_LANDSCAPE=1
5
6DISPLAY_CAN_ROTATE=1
7DISPLAY_ORIENTATION=270
8DISPLAY_WIDTH_PIXELS=480
9DISPLAY_WIDTH_MM=56
10DISPLAY_HEIGHT_PIXELS=640
11DISPLAY_HEIGHT_MM=74
12DISPLAY_BPP=16
13#DISPLAY_DPI=220
14DISPLAY_DPI=150
15DISPLAY_SUBPIXEL_ORDER=rgb
diff --git a/meta/recipes-bsp/formfactor/files/zylonite/machconfig b/meta/recipes-bsp/formfactor/files/zylonite/machconfig
deleted file mode 100755
index 89f7f0c992..0000000000
--- a/meta/recipes-bsp/formfactor/files/zylonite/machconfig
+++ /dev/null
@@ -1,12 +0,0 @@
1HAVE_TOUCHSCREEN=1
2HAVE_KEYBOARD=0
3HAVE_KEYBOARD_PORTRAIT=0
4HAVE_KEYBOARD_LANDSCAPE=0
5
6DISPLAY_CAN_ROTATE=0
7DISPLAY_ORIENTATION=0
8DISPLAY_WIDTH_PIXELS=480
9DISPLAY_HEIGHT_PIXELS=640
10DISPLAY_BPP=16
11#DISPLAY_DPI=220
12DISPLAY_DPI=150
diff --git a/meta/recipes-bsp/keymaps/files/akita/keymap-2.4.map b/meta/recipes-bsp/keymaps/files/akita/keymap-2.4.map
deleted file mode 100644
index e6339979e8..0000000000
--- a/meta/recipes-bsp/keymaps/files/akita/keymap-2.4.map
+++ /dev/null
@@ -1,128 +0,0 @@
1keymaps 0-2,4-5,8
2keycode 1 = +a +A +a Control_a Control_a
3keycode 2 = +b +B underscore Control_b Control_b
4keycode 3 = +c +C +c Control_c Control_c
5keycode 4 = +d +D +d Control_d Control_d
6keycode 5 = +e +E equal Control_e Control_e
7keycode 6 = +f +F backslash Control_f Control_f
8keycode 7 = +g +G semicolon Control_g Control_g
9keycode 8 = +h +H colon BackSpace BackSpace
10keycode 9 = +i +I +i Tab Tab
11keycode 10 = +j +J asterisk Linefeed Linefeed
12keycode 11 = +k +K backslash Control_k Control_k
13keycode 12 = +l +L bar Control_l Control_l
14keycode 13 = +m +M +m Control_m Control_m
15keycode 14 = +n +N +n Control_n Control_n
16keycode 15 = +o +O +o Control_o Control_o
17keycode 16 = +p +P +p Control_p Control_p
18keycode 17 = +q +Q +q Control_q Control_q
19keycode 18 = +r +R plus Control_r Control_r
20keycode 19 = +s +S +s Control_s Control_s
21keycode 20 = +t +T bracketleft Control_t Control_t
22keycode 21 = +u +U +u Control_u Control_u
23keycode 22 = +v +V +v Control_v Control_v
24keycode 23 = +w +W asciicircum Control_w Control_w
25keycode 24 = +x +X +x Control_x Control_x
26keycode 25 = +y +Y bracketright Control_y Control_y
27keycode 26 = +z +Z +z Control_z Control_z
28keycode 27 = Shift Shift Shift Shift Shift
29keycode 28 = Return Return Return Return Return
30keycode 29 = F11 F11 F11 F11 F11
31keycode 30 = AltGr AltGr AltGr AltGr AltGr
32keycode 31 = BackSpace BackSpace Delete BackSpace BackSpace
33keycode 32 = Num_Lock Num_Lock Num_Lock Num_Lock Num_Lock
34keycode 33 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
35keycode 34 = Escape Escape Escape Escape Escape
36keycode 35 = Left Left Left Left Left Decr_Console
37keycode 36 = Up Up PageUp Up Up
38keycode 37 = Down Down PageDown Down Down
39keycode 38 = Right Right Right Right Right Incr_Console
40keycode 39 = Return Return Return Return Return
41keycode 40 = F12 VoidSymbol VoidSymbol VoidSymbol VoidSymbol
42keycode 41 = one exclam VoidSymbol VoidSymbol VoidSymbol Console_1
43keycode 42 = two quotedbl VoidSymbol VoidSymbol VoidSymbol Console_2
44keycode 43 = three numbersign VoidSymbol VoidSymbol VoidSymbol Console_3
45keycode 44 = four dollar VoidSymbol VoidSymbol VoidSymbol Console_4
46keycode 45 = five percent VoidSymbol VoidSymbol VoidSymbol Console_5
47keycode 46 = six ampersand VoidSymbol VoidSymbol VoidSymbol
48keycode 47 = seven apostrophe VoidSymbol VoidSymbol VoidSymbol
49keycode 48 = eight parenleft VoidSymbol VoidSymbol VoidSymbol
50keycode 49 = nine parenright VoidSymbol VoidSymbol VoidSymbol
51keycode 50 = zero asciitilde VoidSymbol VoidSymbol VoidSymbol
52keycode 51 = minus equal VoidSymbol VoidSymbol VoidSymbol
53keycode 52 = asciicircum asciitilde VoidSymbol VoidSymbol VoidSymbol
54keycode 53 = backslash bar VoidSymbol VoidSymbol VoidSymbol
55keycode 54 = bracketleft braceleft VoidSymbol VoidSymbol VoidSymbol
56keycode 55 = at grave VoidSymbol VoidSymbol VoidSymbol
57keycode 56 = Control Control Control Control Control
58keycode 57 = Alt Alt Alt Alt Alt
59keycode 58 = Control Control Control Control Control
60keycode 59 = minus VoidSymbol at VoidSymbol VoidSymbol
61keycode 60 = Shift_Lock Shift_Lock Shift_Lock Shift_Lock Shift_Lock
62keycode 61 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
63keycode 62 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
64keycode 63 = comma slash less VoidSymbol VoidSymbol
65keycode 64 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
66keycode 65 = Tab Tab Caps_Lock Tab Tab
67keycode 66 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
68keycode 67 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
69keycode 68 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
70keycode 69 = Alt VoidSymbol VoidSymbol VoidSymbol VoidSymbol
71keycode 70 = slash VoidSymbol VoidSymbol VoidSymbol VoidSymbol
72keycode 71 = KP_1 KP_1 KP_1 KP_1 KP_1
73keycode 72 = KP_2 KP_2 KP_2 KP_2 KP_2
74keycode 73 = KP_3 KP_3 KP_3 KP_3 KP_3
75keycode 74 = KP_4 KP_4 KP_4 KP_4 KP_4
76keycode 75 = KP_5 KP_5 KP_5 KP_5 KP_5
77keycode 76 = KP_6 KP_6 KP_6 KP_6 KP_6
78keycode 77 = KP_7 KP_7 KP_7 KP_7 KP_7
79keycode 78 = KP_8 KP_8 KP_8 KP_8 KP_8
80keycode 79 = KP_9 KP_9 KP_9 KP_9 KP_9
81keycode 80 = KP_0 KP_0 KP_0 KP_0 KP_0
82keycode 81 = Delete Delete Delete Delete Delete
83keycode 82 = KP_Divide KP_Divide KP_Divide KP_Divide KP_Divide
84keycode 83 = KP_Multiply KP_Multiply KP_Multiply KP_Multiply KP_Multiply
85keycode 84 = Return Return Return Return Return
86keycode 85 = KP_Subtract KP_Subtract KP_Subtract KP_Subtract KP_Subtract
87keycode 86 = KP_Add KP_Add KP_Add KP_Add KP_Add
88keycode 87 = KP_Enter KP_Enter KP_Enter KP_Enter KP_Enter
89keycode 88 = F9 F9 F9 F9 F9
90keycode 89 = F10 F10 F10 F10 F10
91keycode 90 = F13 F13 F13 F13 F13
92keycode 91 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
93keycode 92 = space space space space space
94keycode 93 = KP_Period KP_Period KP_Period KP_Period KP_Period
95keycode 94 = Escape Escape Escape Escape
96keycode 95 = semicolon plus VoidSymbol VoidSymbol VoidSymbol
97keycode 96 = colon asterisk VoidSymbol VoidSymbol VoidSymbol
98keycode 97 = bracketright braceright VoidSymbol VoidSymbol VoidSymbol
99keycode 98 = comma less VoidSymbol VoidSymbol VoidSymbol
100keycode 99 = period greater VoidSymbol VoidSymbol VoidSymbol
101keycode 100 = slash question VoidSymbol VoidSymbol VoidSymbol
102keycode 101 = underscore underscore VoidSymbol VoidSymbol VoidSymbol
103keycode 102 = F15 VoidSymbol VoidSymbol VoidSymbol VoidSymbol
104keycode 103 = period question greater VoidSymbol VoidSymbol
105keycode 104 = Find Find Find Find Find
106keycode 105 = Select Select Select Select Select
107keycode 106 = Prior Scroll_Backward Prior Prior Prior
108keycode 107 = Next Scroll_Forward Next Next Next
109keycode 108 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
110keycode 109 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
111keycode 110 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
112keycode 111 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
113keycode 112 = Shift Shift Shift Shift Shift
114keycode 113 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
115keycode 114 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
116keycode 115 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
117keycode 116 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
118keycode 117 = Control Control Control Control Control
119keycode 118 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
120keycode 119 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
121keycode 120 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
122keycode 121 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
123keycode 122 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
124keycode 123 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
125keycode 124 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
126keycode 125 = Up Up Up Up
127keycode 126 = Down Down Down Down
128keycode 127 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
diff --git a/meta/recipes-bsp/keymaps/files/akita/keymap-2.6.map b/meta/recipes-bsp/keymaps/files/akita/keymap-2.6.map
deleted file mode 100644
index 11a0e8b4d3..0000000000
--- a/meta/recipes-bsp/keymaps/files/akita/keymap-2.6.map
+++ /dev/null
@@ -1,228 +0,0 @@
1# Default kernel keymap. This uses 7 modifier combinations.
2keymaps 0-2,4-5,8,12
3# Change the above line into
4# keymaps 0-2,4-6,8,12
5# in case you want the entries
6# altgr control keycode 83 = Boot
7# altgr control keycode 111 = Boot
8# below.
9#
10keycode 1 =
11keycode 2 = one exclam
12 control alt keycode 2 = Console_1
13keycode 3 = two quotedbl
14 control alt keycode 3 = Console_2
15keycode 4 = three numbersign
16 control alt keycode 4 = Console_3
17keycode 5 = four dollar
18 control alt keycode 5 = Console_4
19keycode 6 = five percent
20 control alt keycode 6 = Console_5
21keycode 7 = six ampersand
22 control alt keycode 7 = Console_6
23keycode 8 = seven apostrophe
24keycode 9 = eight parenleft
25keycode 10 = nine parenright
26keycode 11 = zero asciitilde
27keycode 12 = minus at
28 altgr keycode 12 = at
29keycode 13 =
30keycode 14 = BackSpace
31 altgr keycode 14 = Delete
32keycode 15 = Tab
33 altgr keycode 15 = Caps_Lock
34keycode 16 = q
35keycode 17 = w
36 altgr keycode 17 = asciicircum
37keycode 18 = e
38 altgr keycode 18 = equal
39keycode 19 = r
40 altgr keycode 19 = plus
41keycode 20 = t
42 altgr keycode 20 = bracketleft
43keycode 21 = y
44 altgr keycode 21 = bracketright
45keycode 22 = u
46 altgr keycode 22 = braceleft
47keycode 23 = i
48 altgr keycode 23 = braceright
49keycode 24 = o
50keycode 25 = p
51keycode 26 =
52keycode 27 =
53keycode 28 = Return
54keycode 29 = Control
55keycode 30 = a
56keycode 31 = s
57keycode 32 = d
58keycode 33 = f
59 altgr keycode 33 = backslash
60keycode 34 = g
61 altgr keycode 34 = semicolon
62keycode 35 = h
63 altgr keycode 35 = colon
64keycode 36 = j
65 altgr keycode 36 = asterisk
66keycode 37 = k
67 altgr keycode 37 = backslash
68keycode 38 = l
69 altgr keycode 38 = bar
70keycode 39 =
71keycode 40 =
72keycode 41 =
73keycode 42 = Shift
74keycode 43 =
75keycode 44 = z
76keycode 45 = x
77keycode 46 = c
78keycode 47 = v
79keycode 48 = b
80 altgr keycode 48 = underscore
81keycode 49 = n
82keycode 50 = m
83keycode 51 = comma slash
84 altgr keycode 51 = less
85keycode 52 = period question
86 altgr keycode 52 = greater
87keycode 53 =
88keycode 54 = Shift
89keycode 55 =
90keycode 56 = Alt
91keycode 57 = space space
92 control keycode 57 = nul
93keycode 59 = F9
94keycode 60 = F10
95keycode 61 = AltGr
96keycode 62 = Escape
97keycode 63 = Return
98keycode 64 = Escape
99keycode 65 = Down
100keycode 66 = Up
101keycode 67 = Control
102keycode 68 = F13
103keycode 79 = F15
104keycode 80 = F16
105keycode 82 = F17
106keycode 87 = Return
107keycode 88 = F11
108keycode 97 = Control
109keycode 99 = F12
110keycode 103 = Up
111 altgr keycode 103 = PageUp
112keycode 105 = Left
113 altgr keycode 105 = Decr_Console
114keycode 106 = Right
115 altgr keycode 106 = Incr_Console
116keycode 108 = Down
117 altgr keycode 108 = PageDown
118
119
120# LCD Softkeys as represented by zaurusd
121keycode 82 = F5
122keycode 79 = F15 # Home
123keycode 80 = F6
124keycode 81 = F16 # Email
125keycode 75 = F7
126keycode 76 = F17 # Addresses
127keycode 77 = F8
128keycode 71 = F18 # Calendar
129keycode 72 = F9
130keycode 73 = F19 # Book
131keycode 78 = F10
132
133string F1 = "\033[[A"
134string F2 = "\033[[B"
135string F3 = "\033[[C"
136string F4 = "\033[[D"
137string F5 = "\033[[E"
138string F6 = "\033[17~"
139string F7 = "\033[18~"
140string F8 = "\033[19~"
141string F9 = "\033[20~"
142string F10 = "\033[21~"
143string F11 = "\033[23~"
144string F12 = "\033[24~"
145string F13 = "\033[25~"
146string F14 = "\033[26~"
147string F15 = "\033[28~"
148string F16 = "\033[29~"
149string F17 = "\033[31~"
150string F18 = "\033[32~"
151string F19 = "\033[33~"
152string F20 = "\033[34~"
153string Find = "\033[1~"
154string Insert = "\033[2~"
155string Remove = "\033[3~"
156string Select = "\033[4~"
157string Prior = "\033[5~"
158string Next = "\033[6~"
159string Macro = "\033[M"
160string Pause = "\033[P"
161compose '`' 'A' to 'À'
162compose '`' 'a' to 'à'
163compose '\'' 'A' to 'Á'
164compose '\'' 'a' to 'á'
165compose '^' 'A' to 'Â'
166compose '^' 'a' to 'â'
167compose '~' 'A' to 'Ã'
168compose '~' 'a' to 'ã'
169compose '"' 'A' to 'Ä'
170compose '"' 'a' to 'ä'
171compose 'O' 'A' to 'Å'
172compose 'o' 'a' to 'å'
173compose '0' 'A' to 'Å'
174compose '0' 'a' to 'å'
175compose 'A' 'A' to 'Å'
176compose 'a' 'a' to 'å'
177compose 'A' 'E' to 'Æ'
178compose 'a' 'e' to 'æ'
179compose ',' 'C' to 'Ç'
180compose ',' 'c' to 'ç'
181compose '`' 'E' to 'È'
182compose '`' 'e' to 'è'
183compose '\'' 'E' to 'É'
184compose '\'' 'e' to 'é'
185compose '^' 'E' to 'Ê'
186compose '^' 'e' to 'ê'
187compose '"' 'E' to 'Ë'
188compose '"' 'e' to 'ë'
189compose '`' 'I' to 'Ì'
190compose '`' 'i' to 'ì'
191compose '\'' 'I' to 'Í'
192compose '\'' 'i' to 'í'
193compose '^' 'I' to 'Î'
194compose '^' 'i' to 'î'
195compose '"' 'I' to 'Ï'
196compose '"' 'i' to 'ï'
197compose '-' 'D' to 'Ð'
198compose '-' 'd' to 'ð'
199compose '~' 'N' to 'Ñ'
200compose '~' 'n' to 'ñ'
201compose '`' 'O' to 'Ò'
202compose '`' 'o' to 'ò'
203compose '\'' 'O' to 'Ó'
204compose '\'' 'o' to 'ó'
205compose '^' 'O' to 'Ô'
206compose '^' 'o' to 'ô'
207compose '~' 'O' to 'Õ'
208compose '~' 'o' to 'õ'
209compose '"' 'O' to 'Ö'
210compose '"' 'o' to 'ö'
211compose '/' 'O' to 'Ø'
212compose '/' 'o' to 'ø'
213compose '`' 'U' to 'Ù'
214compose '`' 'u' to 'ù'
215compose '\'' 'U' to 'Ú'
216compose '\'' 'u' to 'ú'
217compose '^' 'U' to 'Û'
218compose '^' 'u' to 'û'
219compose '"' 'U' to 'Ü'
220compose '"' 'u' to 'ü'
221compose '\'' 'Y' to 'Ý'
222compose '\'' 'y' to 'ý'
223compose 'T' 'H' to 'Þ'
224compose 't' 'h' to 'þ'
225compose 's' 's' to 'ß'
226compose '"' 'y' to 'ÿ'
227compose 's' 'z' to 'ß'
228compose 'i' 'j' to 'ÿ'
diff --git a/meta/recipes-bsp/keymaps/files/c7x0/keymap-2.6.map b/meta/recipes-bsp/keymaps/files/c7x0/keymap-2.6.map
deleted file mode 100755
index 6fc3a9a9cf..0000000000
--- a/meta/recipes-bsp/keymaps/files/c7x0/keymap-2.6.map
+++ /dev/null
@@ -1,213 +0,0 @@
1# Default kernel keymap. This uses 7 modifier combinations.
2keymaps 0-2,4-5,8,12
3# Change the above line into
4# keymaps 0-2,4-6,8,12
5# in case you want the entries
6# altgr control keycode 83 = Boot
7# altgr control keycode 111 = Boot
8# below.
9#
10keycode 1 =
11keycode 2 = one exclam
12 control alt keycode 2 = Console_1
13keycode 3 = two quotedbl
14 control alt keycode 3 = Console_2
15keycode 4 = three numbersign
16 control alt keycode 4 = Console_3
17keycode 5 = four dollar
18 control alt keycode 5 = Console_4
19keycode 6 = five percent
20 control alt keycode 6 = Console_5
21keycode 7 = six ampersand
22 control alt keycode 7 = Console_6
23keycode 8 = seven apostrophe
24keycode 9 = eight parenleft
25keycode 10 = nine parenright
26keycode 11 = zero asciitilde
27keycode 12 = minus at
28 altgr keycode 12 = at
29keycode 13 =
30keycode 14 = BackSpace
31 altgr keycode 14 = Delete
32keycode 15 = Tab
33 altgr keycode 15 = Caps_Lock
34keycode 16 = q
35keycode 17 = w
36 altgr keycode 17 = asciicircum
37keycode 18 = e
38 altgr keycode 18 = equal
39keycode 19 = r
40 altgr keycode 19 = plus
41keycode 20 = t
42 altgr keycode 20 = bracketleft
43keycode 21 = y
44 altgr keycode 21 = bracketright
45keycode 22 = u
46 altgr keycode 22 = braceleft
47keycode 23 = i
48 altgr keycode 23 = braceright
49keycode 24 = o
50keycode 25 = p
51keycode 26 =
52keycode 27 =
53keycode 28 = Return
54keycode 29 = Control
55keycode 30 = a
56keycode 31 = s
57keycode 32 = d
58keycode 33 = f
59 altgr keycode 33 = backslash
60keycode 34 = g
61 altgr keycode 34 = semicolon
62keycode 35 = h
63 altgr keycode 35 = colon
64keycode 36 = j
65 altgr keycode 36 = asterisk
66keycode 37 = k
67 altgr keycode 37 = backslash
68keycode 38 = l
69 altgr keycode 38 = bar
70keycode 39 =
71keycode 40 =
72keycode 41 =
73keycode 42 = Shift
74keycode 43 =
75keycode 44 = z
76keycode 45 = x
77keycode 46 = c
78keycode 47 = v
79keycode 48 = b
80 altgr keycode 48 = underscore
81keycode 49 = n
82keycode 50 = m
83keycode 51 = comma slash
84 altgr keycode 51 = less
85keycode 52 = period question
86 altgr keycode 52 = greater
87keycode 53 =
88keycode 54 = Shift
89keycode 55 =
90keycode 56 = Alt
91keycode 57 = space space
92 control keycode 57 = nul
93keycode 59 = F9
94keycode 60 = F10
95keycode 61 = AltGr
96keycode 62 = Escape
97keycode 63 = Return
98keycode 64 = Escape
99keycode 65 = Down
100keycode 66 = Up
101keycode 67 = Control
102keycode 68 = F13
103keycode 79 = F15
104keycode 80 = F16
105keycode 82 = F17
106keycode 87 = Return
107keycode 88 = F11
108keycode 97 = Control
109keycode 99 = F12
110keycode 103 = Up
111 altgr keycode 103 = PageUp
112keycode 105 = Left
113 altgr keycode 105 = Decr_Console
114keycode 106 = Right
115 altgr keycode 106 = Incr_Console
116keycode 108 = Down
117 altgr keycode 108 = PageDown
118string F1 = "\033[[A"
119string F2 = "\033[[B"
120string F3 = "\033[[C"
121string F4 = "\033[[D"
122string F5 = "\033[[E"
123string F6 = "\033[17~"
124string F7 = "\033[18~"
125string F8 = "\033[19~"
126string F9 = "\033[20~"
127string F10 = "\033[21~"
128string F11 = "\033[23~"
129string F12 = "\033[24~"
130string F13 = "\033[25~"
131string F14 = "\033[26~"
132string F15 = "\033[28~"
133string F16 = "\033[29~"
134string F17 = "\033[31~"
135string F18 = "\033[32~"
136string F19 = "\033[33~"
137string F20 = "\033[34~"
138string Find = "\033[1~"
139string Insert = "\033[2~"
140string Remove = "\033[3~"
141string Select = "\033[4~"
142string Prior = "\033[5~"
143string Next = "\033[6~"
144string Macro = "\033[M"
145string Pause = "\033[P"
146compose '`' 'A' to 'À'
147compose '`' 'a' to 'à'
148compose '\'' 'A' to 'Á'
149compose '\'' 'a' to 'á'
150compose '^' 'A' to 'Â'
151compose '^' 'a' to 'â'
152compose '~' 'A' to 'Ã'
153compose '~' 'a' to 'ã'
154compose '"' 'A' to 'Ä'
155compose '"' 'a' to 'ä'
156compose 'O' 'A' to 'Å'
157compose 'o' 'a' to 'å'
158compose '0' 'A' to 'Å'
159compose '0' 'a' to 'å'
160compose 'A' 'A' to 'Å'
161compose 'a' 'a' to 'å'
162compose 'A' 'E' to 'Æ'
163compose 'a' 'e' to 'æ'
164compose ',' 'C' to 'Ç'
165compose ',' 'c' to 'ç'
166compose '`' 'E' to 'È'
167compose '`' 'e' to 'è'
168compose '\'' 'E' to 'É'
169compose '\'' 'e' to 'é'
170compose '^' 'E' to 'Ê'
171compose '^' 'e' to 'ê'
172compose '"' 'E' to 'Ë'
173compose '"' 'e' to 'ë'
174compose '`' 'I' to 'Ì'
175compose '`' 'i' to 'ì'
176compose '\'' 'I' to 'Í'
177compose '\'' 'i' to 'í'
178compose '^' 'I' to 'Î'
179compose '^' 'i' to 'î'
180compose '"' 'I' to 'Ï'
181compose '"' 'i' to 'ï'
182compose '-' 'D' to 'Ð'
183compose '-' 'd' to 'ð'
184compose '~' 'N' to 'Ñ'
185compose '~' 'n' to 'ñ'
186compose '`' 'O' to 'Ò'
187compose '`' 'o' to 'ò'
188compose '\'' 'O' to 'Ó'
189compose '\'' 'o' to 'ó'
190compose '^' 'O' to 'Ô'
191compose '^' 'o' to 'ô'
192compose '~' 'O' to 'Õ'
193compose '~' 'o' to 'õ'
194compose '"' 'O' to 'Ö'
195compose '"' 'o' to 'ö'
196compose '/' 'O' to 'Ø'
197compose '/' 'o' to 'ø'
198compose '`' 'U' to 'Ù'
199compose '`' 'u' to 'ù'
200compose '\'' 'U' to 'Ú'
201compose '\'' 'u' to 'ú'
202compose '^' 'U' to 'Û'
203compose '^' 'u' to 'û'
204compose '"' 'U' to 'Ü'
205compose '"' 'u' to 'ü'
206compose '\'' 'Y' to 'Ý'
207compose '\'' 'y' to 'ý'
208compose 'T' 'H' to 'Þ'
209compose 't' 'h' to 'þ'
210compose 's' 's' to 'ß'
211compose '"' 'y' to 'ÿ'
212compose 's' 'z' to 'ß'
213compose 'i' 'j' to 'ÿ'
diff --git a/meta/recipes-bsp/keymaps/files/collie/keymap-2.4.map b/meta/recipes-bsp/keymaps/files/collie/keymap-2.4.map
deleted file mode 100644
index 4cd8325bb0..0000000000
--- a/meta/recipes-bsp/keymaps/files/collie/keymap-2.4.map
+++ /dev/null
@@ -1,114 +0,0 @@
1keymaps 0-1,4-5
2alt_is_meta
3keycode 1 = a
4keycode 2 = b
5keycode 3 = c
6keycode 4 = d
7keycode 5 = e
8keycode 6 = f
9keycode 7 = g
10keycode 8 = h
11keycode 9 = i
12keycode 10 = j
13keycode 11 = k
14keycode 12 = l
15keycode 13 = m
16keycode 14 = n
17keycode 15 = o
18keycode 16 = p
19keycode 17 = q
20keycode 18 = r
21keycode 19 = s
22keycode 20 = t
23keycode 21 = u
24keycode 22 = v
25keycode 23 = w
26keycode 24 = x
27keycode 25 = y
28keycode 26 = z
29keycode 27 = Shift
30keycode 28 = Return
31keycode 29 = F2
32keycode 30 =
33keycode 31 = BackSpace
34keycode 32 = bar
35keycode 33 =
36keycode 34 = Escape
37keycode 35 = Left
38 control keycode 35 = Decr_Console
39keycode 36 = Up
40keycode 37 = Down
41keycode 38 = Right
42 control keycode 38 = Incr_Console
43keycode 39 = Return
44keycode 40 =
45keycode 41 = one
46keycode 42 = two
47keycode 43 = three
48keycode 44 = four
49keycode 45 = five
50keycode 46 = six
51keycode 47 = seven
52keycode 48 = eight
53keycode 49 = nine
54keycode 50 = zero
55keycode 51 = +adiaeresis
56keycode 52 = +udiaeresis
57keycode 53 = +odiaeresis
58keycode 54 = +Adiaeresis
59keycode 55 = +Udiaeresis
60keycode 56 = +Odiaeresis
61keycode 57 = +ssharp
62keycode 58 = minus
63keycode 59 = plus
64keycode 60 = Shift_Lock
65keycode 61 = at
66keycode 62 = question
67keycode 63 = comma
68keycode 64 = period
69keycode 65 = Tab
70keycode 66 = F5
71keycode 67 = F6
72keycode 68 = F7
73keycode 69 = slash
74keycode 70 = apostrophe
75keycode 71 = semicolon
76keycode 72 = quotedbl
77keycode 73 = colon
78keycode 74 = numbersign
79keycode 75 = dollar
80keycode 76 = percent
81keycode 77 = underscore
82keycode 78 = ampersand
83keycode 79 = asterisk
84keycode 80 = parenleft
85keycode 81 = Delete
86keycode 82 = F10
87keycode 83 = equal
88keycode 84 = parenright
89keycode 85 = asciitilde
90keycode 86 = less
91keycode 87 = greater
92keycode 88 = Control
93keycode 89 = Alt
94keycode 90 =
95keycode 91 = space
96 control keycode 91 = nul
97keycode 92 = space
98 control keycode 92 = nul
99keycode 93 =
100keycode 94 = exclam
101keycode 95 =
102keycode 96 =
103keycode 97 =
104keycode 98 =
105keycode 99 =
106keycode 100 =
107keycode 101 =
108keycode 102 =
109keycode 103 = Shift
110keycode 104 = Control
111keycode 105 = Control
112keycode 106 = Alt
113keycode 107 = Alt
114keycode 108 = AltGr
diff --git a/meta/recipes-bsp/keymaps/files/collie/keymap-2.6.map b/meta/recipes-bsp/keymaps/files/collie/keymap-2.6.map
deleted file mode 100644
index 13eb7d2881..0000000000
--- a/meta/recipes-bsp/keymaps/files/collie/keymap-2.6.map
+++ /dev/null
@@ -1,262 +0,0 @@
1# Note:
2# The way in which the modifiers are handled are quite different
3# than how they were handled in the 2.4.6-rmk1-np2-embedix kernel.
4#
5# Here, we simply pass up Fn as Control, and the german accent key
6# as Altgr, and simply use a proper keymap. Said keymap is as
7# follows.
8# keymaps 0-2,4-5,8,12,20
9keycode 14 = BackSpace
10 shift keycode 14 = BackSpace
11 control keycode 14 = Delete
12 shiftl control keycode 14 = bracketleft
13 control shiftr keycode 14 = bracketleft
14keycode 15 = Tab Tab
15 shift keycode 15 = backslash
16 control keycode 15 = Caps_Lock
17 shiftl control keycode 15 = Caps_Lock
18 control shiftr keycode 15 = Caps_Lock
19keycode 16 = q
20 control keycode 16 = one
21 shiftl control keycode 16 = Control_q
22 control shiftr keycode 16 = Meta_q
23keycode 17 = w
24 control keycode 17 = two
25 shiftl control keycode 17 = Control_w
26 control shiftr keycode 17 = Meta_w
27keycode 18 = e
28 control keycode 18 = three
29 shiftl control keycode 18 = Control_e
30 control shiftr keycode 18 = Meta_e
31keycode 19 = r
32 control keycode 19 = four
33 shiftr control keycode 19 = Control_r
34 control shiftl keycode 19 = Meta_r
35keycode 20 = t
36 control keycode 20 = five
37 shiftl control keycode 20 = Control_t
38 control shiftr keycode 20 = Meta_t
39keycode 21 = y
40 control keycode 21 = six
41 shiftl control keycode 21 = Control_y
42 control shiftr keycode 21 = Meta_y
43keycode 22 = u
44 control keycode 22 = seven
45 shiftl control keycode 22 = Control_u
46 control shiftr keycode 22 = Meta_u
47keycode 23 = i
48 control keycode 23 = eight
49 shiftl control keycode 23 = Control_i
50 control shiftr keycode 23 = Meta_i
51keycode 24 = o
52 control keycode 24 = nine
53 shiftl control keycode 24 = Control_o
54 control shiftr keycode 24 = Meta_o
55keycode 25 = p
56 control keycode 25 = zero
57 shiftl control keycode 25 = Control_p
58 control shiftr keycode 25 = Meta_p
59keycode 28 = Return
60 control keycode 28 = greater
61 shiftl control keycode 28 = braceright
62 control shiftr keycode 28 = braceright
63keycode 29 = Control
64keycode 30 = a
65 control keycode 30 = exclam
66 shiftl control keycode 30 = Control_a
67 control shiftr keycode 30 = Meta_a
68keycode 31 = s
69 control keycode 31 = at
70 shiftl control keycode 31 = Control_s
71 control shiftr keycode 31 = Meta_s
72keycode 32 = d
73 control keycode 32 = numbersign
74 shiftl control keycode 32 = Control_d
75 control shiftr keycode 32 = Meta_d
76keycode 33 = f
77 control keycode 33 = dollar
78 shiftl control keycode 33 = Control_f
79 control shiftr keycode 33 = Meta_f
80keycode 34 = g
81 control keycode 34 = percent
82 shiftl control keycode 34 = Control_g
83 control shiftr keycode 34 = Meta_g
84keycode 35 = h
85 control keycode 35 = underscore
86 shiftl control keycode 35 = BackSpace
87 control shiftr keycode 35 = BackSpace
88keycode 36 = j
89 control keycode 36 = ampersand
90 shiftl control keycode 36 = Linefeed
91 control shiftr keycode 36 = Linefeed
92keycode 37 = k
93 control keycode 37 = asterisk
94 shiftl control keycode 37 = Control_k
95 control shiftr keycode 37 = Meta_k
96keycode 38 = l
97 control keycode 38 = bracketleft
98 shiftl control keycode 51 = parenleft
99 control shiftr keycode 51 = parenleft
100keycode 40 = apostrophe quotedbl
101 control keycode 40 = asciitilde
102 shiftl control keycode 40 = asciicircum
103 control shiftr keycode 40 = asciicircum
104keycode 42 = Shift
105keycode 44 = z
106 control keycode 44 = Control_z
107 shiftl control keycode 44 = Control_z
108 control shiftr keycode 44 = Meta_z
109keycode 45 = x
110 control keycode 45 = Control_x
111 shiftl control keycode 45 = Control_x
112 control shiftr keycode 45 = Meta_x
113keycode 46 = c
114 control keycode 46 = Control_c
115 shiftl control keycode 46 = Control_c
116 control shiftr keycode 46 = Meta_c
117keycode 47 = v
118 control keycode 47 = Control_v
119 shiftl control keycode 47 = Control_v
120 control shiftr keycode 47 = Meta_v
121## current location ##
122keycode 48 = b
123 control keycode 48 = minus
124 shiftl control keycode 48 = Control_b
125 control shiftr keycode 48 = Meta_b
126keycode 49 = n
127 control keycode 49 = plus
128 shiftl control keycode 49 = Control_n
129 control shiftr keycode 49 = Meta_n
130keycode 50 = m
131 control keycode 50 = equal
132 shiftl control keycode 50 = Control_m
133 control shiftr keycode 50 = Meta_m
134keycode 51 = comma
135 shift keycode 51 = semicolon
136 control keycode 51 = bracketright
137 shiftl control keycode 51 = parenright
138 control shiftr keycode 51 = parenright
139keycode 52 = period
140 shift keycode 52 = colon
141 control keycode 52 = less
142 shiftl control keycode 52 = braceleft
143 control shiftr keycode 52 = braceleft
144keycode 53 = slash
145 shift keycode 53 = question
146 control keycode 53 = Num_Lock
147 shiftl control keycode 53 = Num_Lock
148 control shiftr keycode 53 = Num_Lock
149keycode 54 = AltGr
150keycode 55 = KP_Multiply
151keycode 56 = Alt
152keycode 57 = space
153 shift keycode 57 = bar
154 control keycode 57 = nul
155 shiftl control keycode 57 = grave
156 control shiftr keycode 57 = grave
157keycode 67 = Control
158keycode 99 = Control_backslash
159 control keycode 99 = Control_backslash
160keycode 100 = AltGr
161keycode 103 = Up
162keycode 105 = Left
163keycode 106 = Right
164keycode 107 = Select
165keycode 108 = Down
166keycode 116 = Escape
167string F1 = "\033[[A"
168string F2 = "\033[[B"
169string F3 = "\033[[C"
170string F4 = "\033[[D"
171string F5 = "\033[[E"
172string F6 = "\033[17~"
173string F7 = "\033[18~"
174string F8 = "\033[19~"
175string F9 = "\033[20~"
176string F10 = "\033[21~"
177string F11 = "\033[23~"
178string F12 = "\033[24~"
179string F13 = "\033[25~"
180string F14 = "\033[26~"
181string F15 = "\033[28~"
182string F16 = "\033[29~"
183string F17 = "\033[31~"
184string F18 = "\033[32~"
185string F19 = "\033[33~"
186string F20 = "\033[34~"
187string Find = "\033[1~"
188string Insert = "\033[2~"
189string Remove = "\033[3~"
190string Select = "\033[4~"
191string Prior = "\033[5~"
192string Next = "\033[6~"
193string Macro = "\033[M"
194string Pause = "\033[P"
195compose '`' 'A' to 'À'
196compose '`' 'a' to 'à'
197compose '\'' 'A' to 'Á'
198compose '\'' 'a' to 'á'
199compose '^' 'A' to 'Â'
200compose '^' 'a' to 'â'
201compose '~' 'A' to 'Ã'
202compose '~' 'a' to 'ã'
203compose '"' 'A' to 'Ä'
204compose '"' 'a' to 'ä'
205compose 'O' 'A' to 'Å'
206compose 'o' 'a' to 'å'
207compose '0' 'A' to 'Å'
208compose '0' 'a' to 'å'
209compose 'A' 'A' to 'Å'
210compose 'a' 'a' to 'å'
211compose 'A' 'E' to 'Æ'
212compose 'a' 'e' to 'æ'
213compose ',' 'C' to 'Ç'
214compose ',' 'c' to 'ç'
215compose '`' 'E' to 'È'
216compose '`' 'e' to 'è'
217compose '\'' 'E' to 'É'
218compose '\'' 'e' to 'é'
219compose '^' 'E' to 'Ê'
220compose '^' 'e' to 'ê'
221compose '"' 'E' to 'Ë'
222compose '"' 'e' to 'ë'
223compose '`' 'I' to 'Ì'
224compose '`' 'i' to 'ì'
225compose '\'' 'I' to 'Í'
226compose '\'' 'i' to 'í'
227compose '^' 'I' to 'Î'
228compose '^' 'i' to 'î'
229compose '"' 'I' to 'Ï'
230compose '"' 'i' to 'ï'
231compose '-' 'D' to 'Ð'
232compose '-' 'd' to 'ð'
233compose '~' 'N' to 'Ñ'
234compose '~' 'n' to 'ñ'
235compose '`' 'O' to 'Ò'
236compose '`' 'o' to 'ò'
237compose '\'' 'O' to 'Ó'
238compose '\'' 'o' to 'ó'
239compose '^' 'O' to 'Ô'
240compose '^' 'o' to 'ô'
241compose '~' 'O' to 'Õ'
242compose '~' 'o' to 'õ'
243compose '"' 'O' to 'Ö'
244compose '"' 'o' to 'ö'
245compose '/' 'O' to 'Ø'
246compose '/' 'o' to 'ø'
247compose '`' 'U' to 'Ù'
248compose '`' 'u' to 'ù'
249compose '\'' 'U' to 'Ú'
250compose '\'' 'u' to 'ú'
251compose '^' 'U' to 'Û'
252compose '^' 'u' to 'û'
253compose '"' 'U' to 'Ü'
254compose '"' 'u' to 'ü'
255compose '\'' 'Y' to 'Ý'
256compose '\'' 'y' to 'ý'
257compose 'T' 'H' to 'Þ'
258compose 't' 'h' to 'þ'
259compose 's' 's' to 'ß'
260compose '"' 'y' to 'ÿ'
261compose 's' 'z' to 'ß'
262compose 'i' 'j' to 'ÿ'
diff --git a/meta/recipes-bsp/keymaps/files/h2200/keymap-2.6.map b/meta/recipes-bsp/keymaps/files/h2200/keymap-2.6.map
deleted file mode 100644
index 8b4c43fe0b..0000000000
--- a/meta/recipes-bsp/keymaps/files/h2200/keymap-2.6.map
+++ /dev/null
@@ -1,17 +0,0 @@
1# Kernel keymap for h2200 keys
2
3# Apps keys
4keycode 67 = F9
5keycode 68 = F10
6keycode 87 = F11
7keycode 88 = F12
8
9# Joypad
10keycode 103 = Up
11keycode 105 = Left
12keycode 106 = Right
13keycode 108 = Down
14keycode 28 = Return
15
16# Power key
17keycode 116 = F34
diff --git a/meta/recipes-bsp/keymaps/files/htcuniversal/keymap-2.6.map b/meta/recipes-bsp/keymaps/files/htcuniversal/keymap-2.6.map
deleted file mode 100644
index 0d036752de..0000000000
--- a/meta/recipes-bsp/keymaps/files/htcuniversal/keymap-2.6.map
+++ /dev/null
@@ -1,20 +0,0 @@
1altgr keycode 2 = exclam
2altgr keycode 3 = at
3altgr keycode 4 = numbersign
4altgr keycode 6 = percent
5altgr keycode 7 = asciicircum
6altgr keycode 8 = ampersand
7altgr keycode 9 = asterisk
8altgr keycode 10 = parenleft
9altgr keycode 11 = parenright
10altgr keycode 12 = underscore
11altgr keycode 13 = plus
12altgr keycode 15 = tilde
13altgr keycode 24 = slash
14altgr keycode 25 = backslash
15altgr keycode 32 = pound
16altgr keycode 37 = quotedbl
17altgr keycode 38 = apostrophe
18altgr keycode 50 = question
19altgr keycode 51 = semicolon
20altgr keycode 52 = colon
diff --git a/meta/recipes-bsp/keymaps/files/jornada6xx/keymap-de.map b/meta/recipes-bsp/keymaps/files/jornada6xx/keymap-de.map
deleted file mode 100644
index 98083d2e58..0000000000
--- a/meta/recipes-bsp/keymaps/files/jornada6xx/keymap-de.map
+++ /dev/null
@@ -1,597 +0,0 @@
1keymaps 0-6,8-10,12
2keycode 1 = Escape Escape
3keycode 2 = one exclam bar
4keycode 3 = two quotedbl twosuperior
5keycode 4 = three section threesuperior
6 control keycode 4 = Escape
7 alt keycode 4 = Meta_three
8 control alt keycode 4 = Meta_Escape
9keycode 5 = four dollar
10 alt keycode 5 = Meta_four
11 shift alt keycode 5 = Meta_dollar
12keycode 6 = five percent
13 alt keycode 6 = Meta_five
14 shift alt keycode 6 = Meta_percent
15keycode 7 = six ampersand
16 control keycode 7 = Control_asciicircum
17 alt keycode 7 = Meta_six
18 shift alt keycode 7 = Meta_ampersand
19keycode 8 = seven slash braceleft
20 alt keycode 8 = Meta_seven
21 shift alt keycode 8 = Meta_slash
22 altgr alt keycode 8 = Meta_braceleft
23keycode 9 = eight parenleft bracketleft
24 alt keycode 9 = Meta_eight
25 shift alt keycode 9 = Meta_parenleft
26 altgr alt keycode 9 = Meta_bracketleft
27keycode 10 = nine parenright bracketright
28 altgr control keycode 10 = Control_bracketright
29 alt keycode 10 = Meta_nine
30 shift alt keycode 10 = Meta_parenright
31 altgr alt keycode 10 = Meta_bracketright
32keycode 11 = zero equal braceright
33 alt keycode 11 = Meta_zero
34 shift alt keycode 11 = Meta_equal
35 altgr alt keycode 11 = Meta_braceright
36keycode 12 = ssharp question backslash
37 altgr control keycode 12 = Control_backslash
38 shift alt keycode 12 = Meta_question
39 altgr alt keycode 12 = Meta_backslash
40keycode 13 = apostrophe grave
41 alt keycode 13 = 0x08b4
42 shift alt keycode 13 = Meta_grave
43keycode 14 = Delete Delete
44 alt keycode 14 = Meta_Delete
45 shift alt keycode 14 = Meta_Delete
46keycode 15 = Tab Meta_Tab
47 alt keycode 15 = Meta_Tab
48keycode 16 = +q +Q at
49 control keycode 16 = Control_q
50 shift control keycode 16 = Control_q
51 altgr control keycode 16 = nul
52 alt keycode 16 = Meta_q
53 shift alt keycode 16 = Meta_Q
54 altgr alt keycode 16 = Meta_at
55 control alt keycode 16 = Meta_Control_q
56keycode 17 = +w
57 shift keycode 17 = +W
58 shift altgr keycode 17 = VoidSymbol
59 control keycode 17 = Control_w
60 shift control keycode 17 = Control_w
61 altgr control keycode 17 = Control_w
62 alt keycode 17 = Meta_w
63 shift alt keycode 17 = Meta_W
64 altgr alt keycode 17 = Meta_w
65 control alt keycode 17 = Meta_Control_w
66keycode 18 = +e +E currency
67 control keycode 18 = Control_e
68 shift control keycode 18 = Control_e
69 altgr control keycode 18 = Control_e
70 alt keycode 18 = Meta_e
71 shift alt keycode 18 = Meta_E
72 altgr alt keycode 18 = Meta_e
73 control alt keycode 18 = Meta_Control_e
74keycode 19 = +r
75 shift keycode 19 = +R
76 shift altgr keycode 19 = VoidSymbol
77 control keycode 19 = Control_r
78 shift control keycode 19 = Control_r
79 altgr control keycode 19 = Control_r
80 alt keycode 19 = Meta_r
81 shift alt keycode 19 = Meta_R
82 altgr alt keycode 19 = Meta_r
83 control alt keycode 19 = Meta_Control_r
84keycode 20 = +t
85 shift keycode 20 = +T
86 shift altgr keycode 20 = VoidSymbol
87 control keycode 20 = Control_t
88 shift control keycode 20 = Control_t
89 altgr control keycode 20 = Control_t
90 alt keycode 20 = Meta_t
91 shift alt keycode 20 = Meta_T
92 altgr alt keycode 20 = Meta_t
93 control alt keycode 20 = Meta_Control_t
94keycode 21 = +z
95 shift keycode 21 = +Z
96 shift altgr keycode 21 = VoidSymbol
97 control keycode 21 = Control_z
98 shift control keycode 21 = Control_z
99 altgr control keycode 21 = Control_z
100 alt keycode 21 = Meta_z
101 shift alt keycode 21 = Meta_Z
102 altgr alt keycode 21 = Meta_z
103 control alt keycode 21 = Meta_Control_z
104keycode 22 = +u
105 shift keycode 22 = +U
106 shift altgr keycode 22 = VoidSymbol
107 control keycode 22 = Control_u
108 shift control keycode 22 = Control_u
109 altgr control keycode 22 = Control_u
110 alt keycode 22 = Meta_u
111 shift alt keycode 22 = Meta_U
112 altgr alt keycode 22 = Meta_u
113 control alt keycode 22 = Meta_Control_u
114keycode 23 = +i
115 shift keycode 23 = +I
116 shift altgr keycode 23 = VoidSymbol
117 control keycode 23 = Tab
118 shift control keycode 23 = Tab
119 altgr control keycode 23 = Tab
120 alt keycode 23 = Meta_i
121 shift alt keycode 23 = Meta_I
122 altgr alt keycode 23 = Meta_i
123 control alt keycode 23 = Meta_Tab
124keycode 24 = +o
125 shift keycode 24 = +O
126 shift altgr keycode 24 = VoidSymbol
127 control keycode 24 = Control_o
128 shift control keycode 24 = Control_o
129 altgr control keycode 24 = Control_o
130 alt keycode 24 = Meta_o
131 shift alt keycode 24 = Meta_O
132 altgr alt keycode 24 = Meta_o
133 control alt keycode 24 = Meta_Control_o
134keycode 25 = +p
135 shift keycode 25 = +P
136 shift altgr keycode 25 = VoidSymbol
137 control keycode 25 = Control_p
138 shift control keycode 25 = Control_p
139 altgr control keycode 25 = Control_p
140 alt keycode 25 = Meta_p
141 shift alt keycode 25 = Meta_P
142 altgr alt keycode 25 = Meta_p
143 control alt keycode 25 = Meta_Control_p
144keycode 26 = +udiaeresis +Udiaeresis
145keycode 27 = plus asterisk asciitilde
146 alt keycode 27 = Meta_plus
147 shift alt keycode 27 = Meta_asterisk
148keycode 28 = Return
149 shift altgr keycode 28 = VoidSymbol
150 alt keycode 28 = Meta_Control_m
151keycode 29 = Control
152 shift keycode 29 = Compose
153 shift altgr keycode 29 = VoidSymbol
154keycode 30 = +a
155 shift keycode 30 = +A
156 shift altgr keycode 30 = VoidSymbol
157 control keycode 30 = Control_a
158 shift control keycode 30 = Control_a
159 altgr control keycode 30 = Control_a
160 alt keycode 30 = Meta_a
161 shift alt keycode 30 = Meta_A
162 altgr alt keycode 30 = Meta_a
163 control alt keycode 30 = Meta_Control_a
164keycode 31 = +s
165 shift keycode 31 = +S
166 shift altgr keycode 31 = VoidSymbol
167 control keycode 31 = Control_s
168 shift control keycode 31 = Control_s
169 altgr control keycode 31 = Control_s
170 alt keycode 31 = Meta_s
171 shift alt keycode 31 = Meta_S
172 altgr alt keycode 31 = Meta_s
173 control alt keycode 31 = Meta_Control_s
174keycode 32 = +d
175 shift keycode 32 = +D
176 shift altgr keycode 32 = VoidSymbol
177 control keycode 32 = Control_d
178 shift control keycode 32 = Control_d
179 altgr control keycode 32 = Control_d
180 alt keycode 32 = Meta_d
181 shift alt keycode 32 = Meta_D
182 altgr alt keycode 32 = Meta_d
183 control alt keycode 32 = Meta_Control_d
184keycode 33 = +f
185 shift keycode 33 = +F
186 shift altgr keycode 33 = VoidSymbol
187 control keycode 33 = Control_f
188 shift control keycode 33 = Control_f
189 altgr control keycode 33 = Control_f
190 alt keycode 33 = Meta_f
191 shift alt keycode 33 = Meta_F
192 altgr alt keycode 33 = Meta_f
193 control alt keycode 33 = Meta_Control_f
194keycode 34 = +g
195 shift keycode 34 = +G
196 shift altgr keycode 34 = VoidSymbol
197 control keycode 34 = Control_g
198 shift control keycode 34 = Control_g
199 altgr control keycode 34 = Control_g
200 alt keycode 34 = Meta_g
201 shift alt keycode 34 = Meta_G
202 altgr alt keycode 34 = Meta_g
203 control alt keycode 34 = Meta_Control_g
204keycode 35 = +h
205 shift keycode 35 = +H
206 shift altgr keycode 35 = VoidSymbol
207 control keycode 35 = BackSpace
208 shift control keycode 35 = BackSpace
209 altgr control keycode 35 = BackSpace
210 alt keycode 35 = Meta_h
211 shift alt keycode 35 = Meta_H
212 altgr alt keycode 35 = Meta_h
213 control alt keycode 35 = Meta_BackSpace
214keycode 36 = +j
215 shift keycode 36 = +J
216 shift altgr keycode 36 = VoidSymbol
217 control keycode 36 = Linefeed
218 shift control keycode 36 = Linefeed
219 altgr control keycode 36 = Linefeed
220 alt keycode 36 = Meta_j
221 shift alt keycode 36 = Meta_J
222 altgr alt keycode 36 = Meta_j
223 control alt keycode 36 = Meta_Linefeed
224keycode 37 = +k
225 shift keycode 37 = +K
226 shift altgr keycode 37 = VoidSymbol
227 control keycode 37 = Control_k
228 shift control keycode 37 = Control_k
229 altgr control keycode 37 = Control_k
230 alt keycode 37 = Meta_k
231 shift alt keycode 37 = Meta_K
232 altgr alt keycode 37 = Meta_k
233 control alt keycode 37 = Meta_Control_k
234keycode 38 = +l
235 shift keycode 38 = +L
236 shift altgr keycode 38 = VoidSymbol
237 control keycode 38 = Control_l
238 shift control keycode 38 = Control_l
239 altgr control keycode 38 = Control_l
240 alt keycode 38 = Meta_l
241 shift alt keycode 38 = Meta_L
242 altgr alt keycode 38 = Meta_l
243 control alt keycode 38 = Meta_Control_l
244keycode 39 = +odiaeresis +Odiaeresis
245keycode 40 = +adiaeresis +Adiaeresis
246keycode 41 = F11 F23
247 control keycode 41 = Control_asciicircum
248 control alt keycode 41 = Meta_Control_asciicircum
249keycode 42 = Shift Shift Caps_Lock
250 shift altgr keycode 42 = VoidSymbol
251 control keycode 42 = Compose
252keycode 43 = numbersign apostrophe
253 alt keycode 43 = Meta_numbersign
254 shift alt keycode 43 = Meta_apostrophe
255keycode 44 = +y +Y less
256 shift altgr keycode 44 = VoidSymbol
257 control keycode 44 = Control_y
258 shift control keycode 44 = Control_y
259 altgr control keycode 44 = Control_y
260 alt keycode 44 = Meta_y
261 shift alt keycode 44 = Meta_Y
262 altgr alt keycode 44 = Meta_y
263 control alt keycode 44 = Meta_Control_y
264keycode 45 = +x +X greater
265 shift altgr keycode 45 = VoidSymbol
266 control keycode 45 = Control_x
267 shift control keycode 45 = Control_x
268 altgr control keycode 45 = Control_x
269 alt keycode 45 = Meta_x
270 shift alt keycode 45 = Meta_X
271 altgr alt keycode 45 = Meta_x
272 control alt keycode 45 = Meta_Control_x
273keycode 46 = +c +C cent
274 control keycode 46 = Control_c
275 shift control keycode 46 = Control_c
276 altgr control keycode 46 = Control_c
277 alt keycode 46 = Meta_c
278 shift alt keycode 46 = Meta_C
279 altgr alt keycode 46 = Meta_c
280 control alt keycode 46 = Meta_Control_c
281keycode 47 = +v
282 shift keycode 47 = +V
283 shift altgr keycode 47 = VoidSymbol
284 control keycode 47 = Control_v
285 shift control keycode 47 = Control_v
286 altgr control keycode 47 = Control_v
287 alt keycode 47 = Meta_v
288 shift alt keycode 47 = Meta_V
289 altgr alt keycode 47 = Meta_v
290 control alt keycode 47 = Meta_Control_v
291keycode 48 = +b
292 shift keycode 48 = +B
293 shift altgr keycode 48 = VoidSymbol
294 control keycode 48 = Control_b
295 shift control keycode 48 = Control_b
296 altgr control keycode 48 = Control_b
297 alt keycode 48 = Meta_b
298 shift alt keycode 48 = Meta_B
299 altgr alt keycode 48 = Meta_b
300 control alt keycode 48 = Meta_Control_b
301keycode 49 = +n
302 shift keycode 49 = +N
303 shift altgr keycode 49 = VoidSymbol
304 control keycode 49 = Control_n
305 shift control keycode 49 = Control_n
306 altgr control keycode 49 = Control_n
307 alt keycode 49 = Meta_n
308 shift alt keycode 49 = Meta_N
309 altgr alt keycode 49 = Meta_n
310 control alt keycode 49 = Meta_Control_n
311keycode 50 = +m +M mu
312 control keycode 50 = Control_m
313 shift control keycode 50 = Control_m
314 altgr control keycode 50 = Control_m
315 alt keycode 50 = Meta_m
316 shift alt keycode 50 = Meta_M
317 altgr alt keycode 50 = Meta_m
318 control alt keycode 50 = Meta_Control_m
319keycode 51 = comma semicolon
320 alt keycode 51 = Meta_comma
321 shift alt keycode 51 = Meta_semicolon
322keycode 52 = period colon
323 alt keycode 52 = Meta_period
324 shift alt keycode 52 = Meta_colon
325keycode 53 = minus underscore Meta_minus
326 shift control keycode 53 = Control_underscore
327 alt keycode 53 = Meta_minus
328 shift alt keycode 53 = Meta_underscore
329keycode 54 = Shift
330 shift altgr keycode 54 = VoidSymbol
331 control keycode 54 = Compose
332keycode 56 = Alt
333 shift altgr keycode 56 = VoidSymbol
334keycode 57 = space space Meta_space
335 control keycode 57 = nul
336 alt keycode 57 = Meta_space
337 shift alt keycode 57 = Meta_space
338 control alt keycode 57 = Meta_nul
339keycode 58 = F9
340 shift altgr keycode 58 = VoidSymbol
341keycode 59 = F1 F13 Console_13
342 control keycode 59 = F25
343 alt keycode 59 = Console_1
344 control alt keycode 59 = Console_1
345keycode 60 = F2 F14 Console_14
346 control keycode 60 = F26
347 alt keycode 60 = Console_2
348 control alt keycode 60 = Console_2
349keycode 61 = F3 F15 Console_15
350 control keycode 61 = F27
351 alt keycode 61 = Console_3
352 control alt keycode 61 = Console_3
353keycode 62 = F4 F16 Console_16
354 control keycode 62 = F28
355 alt keycode 62 = Console_4
356 control alt keycode 62 = Console_4
357keycode 63 = F5 F17 Console_17
358 control keycode 63 = F29
359 alt keycode 63 = Console_5
360 control alt keycode 63 = Console_5
361keycode 64 = F6 F18 Console_18
362 control keycode 64 = F30
363 alt keycode 64 = Console_6
364 control alt keycode 64 = Console_6
365keycode 65 = F7 F19 Console_19
366 control keycode 65 = F31
367 alt keycode 65 = Console_7
368 control alt keycode 65 = Console_7
369keycode 66 = F8 F20 Console_20
370 control keycode 66 = F32
371 alt keycode 66 = Console_8
372 control alt keycode 66 = Console_8
373keycode 72 = Up
374 alt keycode 72 = Prior
375 shift alt keycode 72 = Scroll_Backward
376keycode 75 = KP_4
377 altgr keycode 75 = Hex_4
378 shift altgr keycode 75 = VoidSymbol
379 alt keycode 75 = Find
380keycode 77 = KP_6
381 altgr keycode 77 = Hex_6
382 shift altgr keycode 77 = VoidSymbol
383 alt keycode 77 = Select
384keycode 80 = KP_2
385 altgr keycode 80 = Hex_2
386 shift altgr keycode 80 = VoidSymbol
387 alt keycode 80 = Next
388keycode 83 = Remove
389 alt keycode 83 = Insert
390 shift altgr keycode 83 = VoidSymbol
391 altgr control keycode 83 = Boot
392 control alt keycode 83 = Boot
393keycode 91 = Insert
394keycode 112 = F10 F22
395 shift altgr keycode 112 = VoidSymbol
396 altgr control keycode 112 = VoidSymbol
397 shift alt keycode 112 = VoidSymbol
398 altgr alt keycode 112 = VoidSymbol
399keycode 115 = AltGr
400 shift altgr keycode 115 = VoidSymbol
401 altgr control keycode 115 = VoidSymbol
402 shift alt keycode 115 = VoidSymbol
403 altgr alt keycode 115 = VoidSymbol
404keycode 123 = asciicircum degree
405string F1 = "\033[[A"
406string F2 = "\033[[B"
407string F3 = "\033[[C"
408string F4 = "\033[[D"
409string F5 = "\033[[E"
410string F6 = "\033[17~"
411string F7 = "\033[18~"
412string F8 = "\033[19~"
413string F9 = "\033[20~"
414string F10 = "\033[21~"
415string F11 = "\033[23~"
416string F12 = "\033[24~"
417string F13 = "\033[25~"
418string F14 = "\033[26~"
419string F15 = "\033[28~"
420string F16 = "\033[29~"
421string F17 = "\033[31~"
422string F18 = "\033[32~"
423string F19 = "\033[33~"
424string F20 = "\033[34~"
425string Find = "\033[1~"
426string Insert = "\033[2~"
427string Remove = "\033[3~"
428string Select = "\033[4~"
429string Prior = "\033[5~"
430string Next = "\033[6~"
431string Macro = "\033[M"
432string Pause = "\033[P"
433compose '`' 'A' to 'À'
434compose '`' 'a' to 'à'
435compose '\'' 'A' to 'Á'
436compose '\'' 'a' to 'á'
437compose '^' 'A' to 'Â'
438compose '^' 'a' to 'â'
439compose '~' 'A' to 'Ã'
440compose '~' 'a' to 'ã'
441compose '"' 'A' to 'Ä'
442compose '"' 'a' to 'ä'
443compose '-' 'a' to 'ª'
444compose '-' 'A' to 'ª'
445compose 'O' 'A' to 'Å'
446compose 'o' 'a' to 'å'
447compose '0' 'A' to 'Å'
448compose '0' 'a' to 'å'
449compose 'A' 'A' to 'Å'
450compose 'a' 'a' to 'å'
451compose '°' 'A' to 'Å'
452compose '°' 'a' to 'å'
453compose 'A' 'E' to 'Æ'
454compose 'a' 'e' to 'æ'
455compose ',' 'C' to 'Ç'
456compose ',' 'c' to 'ç'
457compose '^' 'C' to 'Ç'
458compose '^' 'c' to 'ç'
459compose '`' 'E' to 'È'
460compose '`' 'e' to 'è'
461compose '\'' 'E' to 'É'
462compose '\'' 'e' to 'é'
463compose '^' 'E' to 'Ê'
464compose '^' 'e' to 'ê'
465compose '"' 'E' to 'Ë'
466compose '"' 'e' to 'ë'
467compose '`' 'I' to 'Ì'
468compose '`' 'i' to 'ì'
469compose '\'' 'I' to 'Í'
470compose '\'' 'i' to 'í'
471compose '^' 'I' to 'Î'
472compose '^' 'i' to 'î'
473compose '"' 'I' to 'Ï'
474compose '"' 'i' to 'ï'
475compose '-' 'D' to 'Ð'
476compose '-' 'd' to 'ð'
477compose '^' 'D' to 'Ð'
478compose '^' 'd' to 'ð'
479compose '~' 'N' to 'Ñ'
480compose '~' 'n' to 'ñ'
481compose '^' 'N' to 'Ñ'
482compose '^' 'n' to 'ñ'
483compose '`' 'O' to 'Ò'
484compose '`' 'o' to 'ò'
485compose '\'' 'O' to 'Ó'
486compose '\'' 'o' to 'ó'
487compose '^' 'O' to 'Ô'
488compose '^' 'o' to 'ô'
489compose '~' 'O' to 'Õ'
490compose '~' 'o' to 'õ'
491compose '"' 'O' to 'Ö'
492compose '"' 'o' to 'ö'
493compose '/' 'O' to 'Ø'
494compose '/' 'o' to 'ø'
495compose '-' 'o' to 'º'
496compose '-' 'O' to 'º'
497compose '`' 'U' to 'Ù'
498compose '`' 'u' to 'ù'
499compose '\'' 'U' to 'Ú'
500compose '\'' 'u' to 'ú'
501compose '^' 'U' to 'Û'
502compose '^' 'u' to 'û'
503compose '"' 'U' to 'Ü'
504compose '"' 'u' to 'ü'
505compose '\'' 'Y' to 'Ý'
506compose '\'' 'y' to 'ý'
507compose 'T' 'H' to 'Þ'
508compose 't' 'h' to 'þ'
509compose 's' 's' to 'ß'
510compose '"' 'y' to 'ÿ'
511compose 's' 'z' to 'ß'
512compose 'n' 'n' to 'ñ'
513compose 'n' 'h' to 'ñ'
514compose 'N' 'Y' to 'Ñ'
515compose 'N' 'N' to 'Ñ'
516compose 'N' 'H' to 'Ñ'
517compose 'N' 'y' to 'Ñ'
518compose 'N' 'n' to 'Ñ'
519compose 'N' 'h' to 'Ñ'
520compose '-' 'L' to '£'
521compose '<' '<' to '«'
522compose '>' '>' to '»'
523compose '?' '?' to '¿'
524compose '^' '?' to '¿'
525compose '!' '!' to '¡'
526compose '^' '!' to '¡'
527compose '^' '1' to '¹'
528compose '^' '2' to '²'
529compose '^' '3' to '³'
530compose '+' '-' to '±'
531compose 'c' '=' to '¢'
532compose 'c' '/' to '¢'
533compose '/' 'c' to '¢'
534compose '-' 'c' to '¢'
535compose '-' 'C' to '¢'
536compose '|' 'c' to '¢'
537compose '|' 'C' to '¢'
538compose 'L' '=' to '£'
539compose '-' 'L' to '£'
540compose '-' 'l' to '£'
541compose '^' '*' to '×'
542compose '^' 'x' to '×'
543compose 'x' 'x' to '×'
544compose '^' '.' to '·'
545compose '.' '.' to '·'
546compose '^' '/' to '÷'
547compose '^' ':' to '÷'
548compose '-' ':' to '÷'
549compose ':' '-' to '÷'
550compose 'Y' '=' to '¥'
551compose '=' 'Y' to '¥'
552compose '-' 'Y' to '¥'
553compose '-' 'l' to '¥'
554compose '(' 'c' to '©'
555compose '"' 'c' to '©'
556compose 'O' 'C' to '©'
557compose '(' 'C' to '©'
558compose 'C' ')' to '©'
559compose '-' 'a' to 'ª'
560compose '-' 'A' to 'ª'
561compose '-' 'o' to 'º'
562compose '-' 'O' to 'º'
563compose '(' 'r' to '®'
564compose '"' 'r' to '®'
565compose 'O' 'R' to '®'
566compose '(' 'R' to '®'
567compose 'R' ')' to '®'
568compose 'm' 'u' to 'µ'
569compose 'P' 'P' to '¶'
570compose '1' '4' to '¼'
571compose '1' '2' to '½'
572compose '3' '4' to '¾'
573compose 'e' '=' to '¤'
574compose '-' 'e' to '¤'
575compose '-' 'E' to '¤'
576compose '=' 'E' to '¤'
577compose 'v' 'S' to '¦'
578compose '^' 'S' to '¦'
579compose 'v' 's' to '¨'
580compose '^' 's' to '¨'
581compose 'v' 'Z' to '´'
582compose '^' 'Z' to '´'
583compose 'v' 'z' to '¸'
584compose '^' 'z' to '¸'
585compose 'O' 'E' to '¼'
586compose 'O' 'e' to '¼'
587compose 'o' 'e' to '½'
588compose '"' 'Y' to '¾'
589compose 'i' 'j' to 'ÿ'
590compose 'I' 'J' to '¾'
591compose '|' 's' to '$'
592compose '|' 'S' to '$'
593compose 'S' 'S' to '§'
594compose '=' 'C' to '¤'
595compose 'C' '=' to '¤'
596compose 'o' 'x' to '¤'
597compose 'x' 'o' to '¤'
diff --git a/meta/recipes-bsp/keymaps/files/jornada6xx/keymap-sp.map b/meta/recipes-bsp/keymaps/files/jornada6xx/keymap-sp.map
deleted file mode 100644
index ba05387743..0000000000
--- a/meta/recipes-bsp/keymaps/files/jornada6xx/keymap-sp.map
+++ /dev/null
@@ -1,222 +0,0 @@
1# <ES.Keymap> for JLime
2#
3# By Pau Rodriguez-Estivill
4# <20060708>
5
6strings as usual
7
8keycode 1 = Escape
9keycode 2 = one
10 shift keycode 2 = exclam
11 AltGr keycode 2 = 0246
12keycode 3 = two
13 Shift keycode 3 = quotedbl
14 AltGr keycode 3 = 0247
15keycode 4 = three
16 shift keycode 4 = numbersign
17keycode 5 = four
18 shift keycode 5 = dollar
19 AltGr keycode 5 = asciitilde
20keycode 6 = five
21 shift keycode 6 = percent
22keycode 7 = six
23 shift keycode 7 = ampersand
24keycode 8 = seven
25 shift keycode 8 = slash
26keycode 9 = eight
27 shift keycode 9 = parenleft
28keycode 10 = nine
29 shift keycode 10 = parenright
30keycode 11 = zero
31 shift keycode 11 = equal
32keycode 12 = apostrophe
33 shift keycode 12 = question
34 AltGr keycode 12 = backslash
35keycode 13 = 0250
36 shift keycode 13 = 0255
37keycode 14 = Delete
38keycode 15 = Tab
39keycode 16 = +q +Q
40 AltGr keycode 16 = at
41keycode 17 = +w
42 shift keycode 17 = +W
43keycode 18 = +e +E
44 AltGr keycode 18 = currency
45keycode 19 = +r
46 shift keycode 19 = +R
47keycode 20 = +t
48 shift keycode 20 = +T
49keycode 21 = +y
50 shift keycode 21 = +Y
51keycode 22 = +u
52 shift keycode 22 = +U
53keycode 23 = +i
54 shift keycode 23 = +I
55keycode 24 = +o
56 shift keycode 24 = +O
57keycode 25 = +p
58 shift keycode 25 = +P
59keycode 26 = dead_acute
60 shift keycode 26 = dead_diaeresis
61keycode 27 = plus asterisk asciitilde
62keycode 28 = Return
63keycode 29 = Control
64 AltGr keycode 29 = Num_Lock
65keycode 30 = +a
66 shift keycode 30 = +A
67keycode 31 = +s
68 shift keycode 31 = +S
69keycode 32 = +d
70 shift keycode 32 = +D
71keycode 33 = +f
72 shift keycode 33 = +F
73keycode 34 = +g
74 shift keycode 34 = +G
75keycode 35 = +h
76 shift keycode 35 = +H
77keycode 36 = +j
78 shift keycode 36 = +J
79keycode 37 = +k
80 shift keycode 37 = +K
81keycode 38 = +l
82 shift keycode 38 = +L
83keycode 39 = +0244
84 shift keycode 39 = +0245
85keycode 40 = braceleft
86 shift keycode 40 = bracketleft
87 AltGr keycode 40 = dead_circumflex
88keycode 41 = F11
89 alt keycode 41 = Console_11
90 shift keycode 41 = F12
91 shift alt keycode 41 = Console_12
92keycode 42 = Shift
93 AltGr keycode 42 = Caps_Lock
94keycode 43 = braceright
95 shift keycode 43 = bracketright
96 AltGr keycode 43 = dead_grave
97keycode 44 = +z +Z
98 AltGr keycode 44 = less
99keycode 45 = +x +X
100 AltGr keycode 45 = greater
101keycode 46 = +c +C
102 AltGr keycode 46 = 0247
103 shift AltGr keycode 46 = 0246
104keycode 47 = +v
105 shift keycode 47 = +V
106keycode 48 = +b
107 shift keycode 48 = +B
108keycode 49 = +n
109 shift keycode 49 = +N
110keycode 50 = +m +M mu
111keycode 51 = comma
112 shift keycode 51 = semicolon
113keycode 52 = period
114 shift keycode 52 = colon
115keycode 53 = minus underscore Meta_minus
116keycode 54 = Shift
117keycode 56 = Alt
118keycode 57 = space space Meta_space
119keycode 58 = F9
120 alt keycode 58 = Console_9
121keycode 59 = F1
122keycode 60 = F2
123keycode 61 = F3
124 alt keycode 61 = Console_3
125keycode 62 = F4
126 alt keycode 62 = Console_4
127keycode 63 = F5
128 alt keycode 63 = Console_5
129keycode 64 = F6
130 alt keycode 64 = Console_6
131keycode 65 = F7
132 alt keycode 65 = Console_7
133keycode 66 = F8
134 alt keycode 66 = Console_8
135keycode 72 = Up
136 alt keycode 72 = PageUp
137 shift alt keycode 72 = Scroll_Backward
138keycode 75 = Left
139 alt keycode 75 = Home
140keycode 77 = Right
141 alt keycode 77 = End
142keycode 80 = Down
143 alt keycode 80 = PageDown
144 shift alt keycode 80 = Scroll_Forward
145keycode 83 = Remove
146 alt keycode 83 = Insert
147keycode 91 = Insert
148keycode 112 = F10
149 alt keycode 112 = Console_10
150keycode 115 = AltGr
151keycode 123 = bar
152 shift keycode 123 = 0372
153 AltGr keycode 123 = +0252
154! compose for cp 850
155compose '`' 'A' to '·'
156compose '`' 'a' to '…'
157compose '\'' 'A' to 'µ'
158compose '\'' 'a' to ' '
159compose '^' 'A' to '¶'
160compose '^' 'a' to 'ƒ'
161compose '~' 'A' to 'Ç'
162compose '~' 'a' to 'Æ'
163compose '"' 'A' to 'Ž'
164compose '"' 'a' to '„'
165compose 'O' 'A' to ''
166compose 'o' 'a' to '†'
167compose '0' 'A' to ''
168compose '0' 'a' to '†'
169compose 'A' 'A' to ''
170compose 'a' 'a' to '†'
171compose 'A' 'E' to '’'
172compose 'a' 'e' to '‘'
173compose ',' 'C' to '€'
174compose ',' 'c' to '‡'
175compose '`' 'E' to 'Ô'
176compose '`' 'e' to 'Š'
177compose '\'' 'E' to ''
178compose '\'' 'e' to '‚'
179compose '^' 'E' to 'Ò'
180compose '^' 'e' to 'ˆ'
181compose '"' 'E' to 'Ó'
182compose '"' 'e' to '‰'
183compose '`' 'I' to 'Þ'
184compose '`' 'i' to ''
185compose '\'' 'I' to 'Ö'
186compose '\'' 'i' to '¡'
187compose '^' 'I' to '×'
188compose '^' 'i' to 'Œ'
189compose '"' 'I' to 'Ø'
190compose '"' 'i' to '‹'
191compose '-' 'D' to 'Ñ'
192compose '-' 'd' to 'Ð'
193compose '~' 'N' to '¥'
194compose '~' 'n' to '¤'
195compose '`' 'O' to 'ã'
196compose '`' 'o' to '•'
197compose '\'' 'O' to 'à'
198compose '\'' 'o' to '¢'
199compose '^' 'O' to 'â'
200compose '^' 'o' to '“'
201compose '~' 'O' to 'å'
202compose '~' 'o' to 'ä'
203compose '"' 'O' to '™'
204compose '"' 'o' to '”'
205compose '/' 'O' to ''
206compose '/' 'o' to '›'
207compose '`' 'U' to 'ë'
208compose '`' 'u' to '—'
209compose '\'' 'U' to 'é'
210compose '\'' 'u' to '£'
211compose '^' 'U' to 'ê'
212compose '^' 'u' to '–'
213compose '"' 'U' to 'š'
214compose '"' 'u' to ''
215compose '\'' 'Y' to 'í'
216compose '\'' 'y' to 'ì'
217compose 'T' 'H' to 'è'
218compose 't' 'h' to 'ç'
219compose 's' 's' to 'á'
220compose '"' 'y' to '˜'
221compose 's' 'z' to 'á'
222compose 'i' 'j' to '˜'
diff --git a/meta/recipes-bsp/keymaps/files/jornada6xx/keymap-uk.map b/meta/recipes-bsp/keymaps/files/jornada6xx/keymap-uk.map
deleted file mode 100644
index a7bb082464..0000000000
--- a/meta/recipes-bsp/keymaps/files/jornada6xx/keymap-uk.map
+++ /dev/null
@@ -1,278 +0,0 @@
1# English keymap for Jornada 6xx devices.
2#
3# Created by Tibor Zenis ( zenis <at> fmph.uniba.sk )
4# (Lightly) Modified by Alex Palestras ( B_Linuz <at> yahoo.com )
5# plain, shift, altgr, ctrl, shift + ctrl, alt, ctrl + alt
6
7keymaps 0-2,4-5,8,12
8keycode 1 = Escape Escape
9 alt keycode 1 = Meta_Escape
10keycode 2 = one exclam asciitilde
11 alt keycode 2 = Meta_one
12keycode 3 = two at grave
13 alt keycode 3 = Meta_two
14keycode 4 = three numbersign
15 alt keycode 4 = Meta_three
16 altgr keycode 4 = pound
17keycode 5 = four dollar
18 control keycode 5 = Control_backslash
19 alt keycode 5 = Meta_four
20 altgr keycode 5 = currency
21keycode 6 = five percent
22 control keycode 6 = Control_bracketright
23 alt keycode 6 = Meta_five
24keycode 7 = six asciicircum
25 control keycode 7 = Control_asciicircum
26 alt keycode 7 = Meta_six
27keycode 8 = seven ampersand braceleft
28 control keycode 8 = Control_underscore
29 altgr keycode 8 = KP_7
30keycode 9 = eight asterisk bracketleft
31 control keycode 9 = Delete
32 altgr keycode 9 = KP_8
33keycode 10 = nine parenleft bracketright
34 altgr keycode 10 = KP_9
35keycode 11 = zero parenright braceright
36 altgr keycode 11 = KP_Divide
37keycode 12 = minus underscore backslash
38 control keycode 11 = Control_underscore
39 shift control keycode 11 = Control_underscore
40 alt keycode 11 = Meta_minus
41keycode 13 = equal plus
42 alt keycode 13 = Meta_equal
43keycode 14 = Delete Delete
44 control keycode 14 = BackSpace
45 alt keycode 14 = Meta_Delete
46keycode 15 = Tab Tab
47 alt keycode 15 = Meta_Tab
48keycode 16 = q
49keycode 17 = w
50keycode 18 = e
51 Shift keycode 18 = E
52keycode 19 = r
53keycode 20 = t
54keycode 21 = y
55 altgr keycode 21 = KP_4
56keycode 22 = u
57 altgr keycode 22 = KP_5
58keycode 23 = i
59 altgr keycode 23 = KP_6
60keycode 24 = o
61 altgr keycode 24 = KP_Multiply
62keycode 25 = p
63 AltGr keycode 25 = braceleft
64keycode 26 = backslash bar
65 AltGr keycode 26 = braceright
66keycode 28 = Return
67 alt keycode 28 = Meta_Control_m
68keycode 29 = Control
69 altgr keycode 29 = Num_Lock
70keycode 30 = a
71keycode 31 = s
72keycode 32 = d
73keycode 33 = f
74keycode 34 = g
75keycode 35 = h
76 altgr keycode 35 = KP_1
77keycode 36 = j
78 altgr keycode 36 = KP_2
79keycode 37 = k
80 altgr keycode 37 = KP_3
81keycode 38 = l
82 altgr keycode 38 = KP_Subtract
83keycode 39 = semicolon colon bracketleft
84 alt keycode 39 = Meta_semicolon
85keycode 40 = apostrophe quotedbl bracketright
86 control keycode 40 = Control_g
87 alt keycode 40 = Meta_apostrophe
88keycode 41 = F11
89 shift keycode 41 = F21
90 altgr keycode 41 = Console_23
91 alt keycode 41 = Console_11
92 control alt keycode 41 = Console_11
93keycode 42 = Shift
94 altgr keycode 42 = Caps_Lock
95keycode 44 = z
96keycode 45 = x
97keycode 46 = c
98keycode 47 = v
99keycode 48 = b
100keycode 49 = n
101 altgr keycode 49 = KP_0
102keycode 50 = m
103 altgr keycode 50 = KP_Comma
104keycode 51 = comma less
105 altgr keycode 51 = KP_Period
106keycode 52 = period greater
107 control keycode 52 = Compose
108 altgr keycode 52 = KP_Add
109keycode 54 = Shift
110keycode 56 = Alt
111keycode 57 = space space
112 alt keycode 57 = Meta_space
113keycode 58 = F9
114 shift keycode 58 = F19
115 altgr keycode 58 = Console_21
116 alt keycode 58 = Console_9
117 control alt keycode 58 = Console_9
118keycode 59 = F1
119 altgr keycode 59 = Console_13
120 alt keycode 59 = Console_1
121 control alt keycode 59 = Console_1
122keycode 60 = F2
123 shift keycode 60 = F12
124 altgr keycode 60 = Console_14
125 alt keycode 60 = Console_2
126 control alt keycode 60 = Console_2
127keycode 61 = F3
128 shift keycode 61 = F13
129 altgr keycode 61 = Console_15
130 alt keycode 61 = Console_3
131 control alt keycode 61 = Console_3
132keycode 62 = F4
133 shift keycode 62 = F14
134 altgr keycode 62 = Console_16
135 alt keycode 62 = Console_4
136 control alt keycode 62 = Console_4
137keycode 63 = F5
138 shift keycode 63 = F15
139 altgr keycode 63 = Console_17
140 alt keycode 63 = Console_5
141 control alt keycode 63 = Console_5
142keycode 64 = F6
143 shift keycode 64 = F16
144 altgr keycode 64 = Console_18
145 alt keycode 64 = Console_6
146 control alt keycode 64 = Console_6
147keycode 65 = F7
148 shift keycode 65 = F17
149 altgr keycode 65 = Console_19
150 alt keycode 65 = Console_7
151 control alt keycode 65 = Console_7
152keycode 66 = F8
153 shift keycode 66 = F18
154 altgr keycode 66 = Console_20
155 alt keycode 66 = Console_8
156 control alt keycode 66 = Console_8
157keycode 72 = Up
158 shift keycode 72 = Scroll_Backward
159 altgr keycode 72 = Scroll_Backward
160 alt keycode 72 = Prior
161keycode 75 = Left
162 altgr keycode 75 = Decr_Console
163 alt keycode 75 = Find
164keycode 77 = Right
165 altgr keycode 77 = Incr_Console
166 alt keycode 77 = Select
167keycode 80 = Down
168 shift keycode 80 = Scroll_Forward
169 altgr keycode 80 = Scroll_Forward
170 alt keycode 80 = Next
171keycode 83 = Remove Remove Meta_Delete
172 alt keycode 83 = Meta_Delete
173keycode 112 = F10
174 shift keycode 112 = F20
175 altgr keycode 112 = Console_22
176 alt keycode 112 = Console_10
177 control alt keycode 112 = Console_10
178keycode 115 = slash question
179 control keycode 115 = Delete
180 alt keycode 115 = Meta_slash
181keycode 123 = AltGr
182keycode 219 = Insert
183string F1 = "\033[11~"
184string F2 = "\033[12~"
185string F3 = "\033[13~"
186string F4 = "\033[14~"
187string F5 = "\033[15~"
188string F6 = "\033[17~"
189string F7 = "\033[18~"
190string F8 = "\033[19~"
191string F9 = "\033[20~"
192string F10 = "\033[21~"
193string F11 = "\033[23~"
194string F12 = "\033[24~"
195string F13 = "\033[25~"
196string F14 = "\033[26~"
197string F15 = "\033[28~"
198string F16 = "\033[29~"
199string F17 = "\033[31~"
200string F18 = "\033[32~"
201string F19 = "\033[33~"
202string F20 = "\033[34~"
203string Find = "\033[1~"
204string Insert = "\033[2~"
205string Remove = "\033[3~"
206string Select = "\033[4~"
207string Prior = "\033[5~"
208string Next = "\033[6~"
209string Macro = "\033[M"
210string Pause = "\033[P"
211compose '`' 'A' to 'À'
212compose '`' 'a' to 'à'
213compose '\'' 'A' to 'Á'
214compose '\'' 'a' to 'á'
215compose '^' 'A' to 'Â'
216compose '^' 'a' to 'â'
217compose '~' 'A' to 'Ã'
218compose '~' 'a' to 'ã'
219compose '"' 'A' to 'Ä'
220compose '"' 'a' to 'ä'
221compose 'O' 'A' to 'Å'
222compose 'o' 'a' to 'å'
223compose '0' 'A' to 'Å'
224compose '0' 'a' to 'å'
225compose 'A' 'A' to 'Å'
226compose 'a' 'a' to 'å'
227compose 'A' 'E' to 'Æ'
228compose 'a' 'e' to 'æ'
229compose ',' 'C' to 'Ç'
230compose ',' 'c' to 'ç'
231compose '`' 'E' to 'È'
232compose '`' 'e' to 'è'
233compose '\'' 'E' to 'É'
234compose '\'' 'e' to 'é'
235compose '^' 'E' to 'Ê'
236compose '^' 'e' to 'ê'
237compose '"' 'E' to 'Ë'
238compose '"' 'e' to 'ë'
239compose '`' 'I' to 'Ì'
240compose '`' 'i' to 'ì'
241compose '\'' 'I' to 'Í'
242compose '\'' 'i' to 'í'
243compose '^' 'I' to 'Î'
244compose '^' 'i' to 'î'
245compose '"' 'I' to 'Ï'
246compose '"' 'i' to 'ï'
247compose '-' 'D' to 'Ð'
248compose '-' 'd' to 'ð'
249compose '~' 'N' to 'Ñ'
250compose '~' 'n' to 'ñ'
251compose '`' 'O' to 'Ò'
252compose '`' 'o' to 'ò'
253compose '\'' 'O' to 'Ó'
254compose '\'' 'o' to 'ó'
255compose '^' 'O' to 'Ô'
256compose '^' 'o' to 'ô'
257compose '~' 'O' to 'Õ'
258compose '~' 'o' to 'õ'
259compose '"' 'O' to 'Ö'
260compose '"' 'o' to 'ö'
261compose '/' 'O' to 'Ø'
262compose '/' 'o' to 'ø'
263compose '`' 'U' to 'Ù'
264compose '`' 'u' to 'ù'
265compose '\'' 'U' to 'Ú'
266compose '\'' 'u' to 'ú'
267compose '^' 'U' to 'Û'
268compose '^' 'u' to 'û'
269compose '"' 'U' to 'Ü'
270compose '"' 'u' to 'ü'
271compose '\'' 'Y' to 'Ý'
272compose '\'' 'y' to 'ý'
273compose 'T' 'H' to 'Þ'
274compose 't' 'h' to 'þ'
275compose 's' 's' to 'ß'
276compose '"' 'y' to 'ÿ'
277compose 's' 'z' to 'ß'
278compose 'i' 'j' to 'ÿ'
diff --git a/meta/recipes-bsp/keymaps/files/poodle/keymap-2.6.map b/meta/recipes-bsp/keymaps/files/poodle/keymap-2.6.map
deleted file mode 100644
index a39b886f5d..0000000000
--- a/meta/recipes-bsp/keymaps/files/poodle/keymap-2.6.map
+++ /dev/null
@@ -1,152 +0,0 @@
1keymaps 0-2,4,8,12
2
3# Default Shift AltGr Control Alt Ctrl+Alt
4keycode 29 = SControl # Calendar
5keycode 60 = SAlt # Address
6keycode 63 = space #Select
7keycode 68 = F13 # Mail
8keycode 87 = F33 #OK
9keycode 88 = F11 # Menu
10keycode 102 = F12 # Home
11keycode 103 = Up Up Prior
12keycode 105 = Left Left Decr_Console
13keycode 106 = Right Right Incr_Console
14keycode 108 = Down Down Next
15keycode 116 = Escape
16
17keycode 14 = BackSpace BackSpace Delete
18keycode 15 = Tab backslash Caps_Lock
19keycode 28 = Return Return greater
20keycode 40 = apostrophe quotedbl tilde
21keycode 42 = SShift
22keycode 51 = comma semicolon parenright
23keycode 52 = period colon less
24keycode 53 = slash question Num_Lock
25keycode 54 = SShift
26keycode 57 = space bar bar
27keycode 67 = SAltGr
28
29keycode 16 = +q +Q one Control_q Meta_q
30keycode 17 = +w +W two Control_w Meta_w
31keycode 18 = +e +E three Control_e Meta_e
32keycode 19 = +r +R four Control_r Meta_r
33keycode 20 = +t +T five Control_t Meta_t
34keycode 21 = +y +Y six Control_y Meta_y
35keycode 22 = +u +U seven Control_u Meta_u
36keycode 23 = +i +I eight Control_i Meta_i
37keycode 24 = +o +O nine Control_o Meta_o
38keycode 25 = +p +P zero Control_p Meta_p
39keycode 30 = +a +A exclam Control_a Meta_a
40keycode 31 = +s +S at Control_s Meta_s
41keycode 32 = +d +D numbersign Control_d Meta_d
42keycode 33 = +f +F dollar Control_f Meta_f
43keycode 34 = +g +G percent Control_g Meta_g
44keycode 35 = +h +H underscore Control_h Meta_h
45keycode 36 = +j +J ampersand Control_j Meta_j
46keycode 37 = +k +K asterisk Control_k Meta_k
47keycode 38 = +l +L parenleft Control_l Meta_l
48keycode 44 = +z +Z VoidSymbol Control_z Meta_z
49keycode 45 = +x +X Control_x Control_x Meta_x
50keycode 46 = +c +C Control_c Control_c Meta_c
51keycode 47 = +v +V Control_v Control_v Meta_v
52keycode 48 = +b +B minus Control_b Meta_b
53keycode 49 = +n +N plus Control_n Meta_n
54keycode 50 = +m +M equal Control_m Meta_m
55
56string F1 = "\033[[A"
57string F2 = "\033[[B"
58string F3 = "\033[[C"
59string F4 = "\033[[D"
60string F5 = "\033[[E"
61string F6 = "\033[17~"
62string F7 = "\033[18~"
63string F8 = "\033[19~"
64string F9 = "\033[20~"
65string F10 = "\033[21~"
66string F11 = "\033[23~"
67string F12 = "\033[24~"
68string F13 = "\033[25~"
69string F14 = "\033[26~"
70string F15 = "\033[28~"
71string F16 = "\033[29~"
72string F17 = "\033[31~"
73string F18 = "\033[32~"
74string F19 = "\033[33~"
75string F20 = "\033[34~"
76string F33 = "\033[49~"
77string Find = "\033[1~"
78string Insert = "\033[2~"
79string Remove = "\033[3~"
80string Select = "\033[4~"
81string Prior = "\033[5~"
82string Next = "\033[6~"
83string Macro = "\033[M"
84string Pause = "\033[P"
85compose '`' 'A' to 'À'
86compose '`' 'a' to 'à'
87compose '\'' 'A' to 'Á'
88compose '\'' 'a' to 'á'
89compose '^' 'A' to 'Â'
90compose '^' 'a' to 'â'
91compose '~' 'A' to 'Ã'
92compose '~' 'a' to 'ã'
93compose '"' 'A' to 'Ä'
94compose '"' 'a' to 'ä'
95compose 'O' 'A' to 'Å'
96compose 'o' 'a' to 'å'
97compose '0' 'A' to 'Å'
98compose '0' 'a' to 'å'
99compose 'A' 'A' to 'Å'
100compose 'a' 'a' to 'å'
101compose 'A' 'E' to 'Æ'
102compose 'a' 'e' to 'æ'
103compose ',' 'C' to 'Ç'
104compose ',' 'c' to 'ç'
105compose '`' 'E' to 'È'
106compose '`' 'e' to 'è'
107compose '\'' 'E' to 'É'
108compose '\'' 'e' to 'é'
109compose '^' 'E' to 'Ê'
110compose '^' 'e' to 'ê'
111compose '"' 'E' to 'Ë'
112compose '"' 'e' to 'ë'
113compose '`' 'I' to 'Ì'
114compose '`' 'i' to 'ì'
115compose '\'' 'I' to 'Í'
116compose '\'' 'i' to 'í'
117compose '^' 'I' to 'Î'
118compose '^' 'i' to 'î'
119compose '"' 'I' to 'Ï'
120compose '"' 'i' to 'ï'
121compose '-' 'D' to 'Ð'
122compose '-' 'd' to 'ð'
123compose '~' 'N' to 'Ñ'
124compose '~' 'n' to 'ñ'
125compose '`' 'O' to 'Ò'
126compose '`' 'o' to 'ò'
127compose '\'' 'O' to 'Ó'
128compose '\'' 'o' to 'ó'
129compose '^' 'O' to 'Ô'
130compose '^' 'o' to 'ô'
131compose '~' 'O' to 'Õ'
132compose '~' 'o' to 'õ'
133compose '"' 'O' to 'Ö'
134compose '"' 'o' to 'ö'
135compose '/' 'O' to 'Ø'
136compose '/' 'o' to 'ø'
137compose '`' 'U' to 'Ù'
138compose '`' 'u' to 'ù'
139compose '\'' 'U' to 'Ú'
140compose '\'' 'u' to 'ú'
141compose '^' 'U' to 'Û'
142compose '^' 'u' to 'û'
143compose '"' 'U' to 'Ü'
144compose '"' 'u' to 'ü'
145compose '\'' 'Y' to 'Ý'
146compose '\'' 'y' to 'ý'
147compose 'T' 'H' to 'Þ'
148compose 't' 'h' to 'þ'
149compose 's' 's' to 'ß'
150compose '"' 'y' to 'ÿ'
151compose 's' 'z' to 'ß'
152compose 'i' 'j' to 'ÿ'
diff --git a/meta/recipes-bsp/keymaps/files/spitz/keymap-2.4.map b/meta/recipes-bsp/keymaps/files/spitz/keymap-2.4.map
deleted file mode 100644
index e6339979e8..0000000000
--- a/meta/recipes-bsp/keymaps/files/spitz/keymap-2.4.map
+++ /dev/null
@@ -1,128 +0,0 @@
1keymaps 0-2,4-5,8
2keycode 1 = +a +A +a Control_a Control_a
3keycode 2 = +b +B underscore Control_b Control_b
4keycode 3 = +c +C +c Control_c Control_c
5keycode 4 = +d +D +d Control_d Control_d
6keycode 5 = +e +E equal Control_e Control_e
7keycode 6 = +f +F backslash Control_f Control_f
8keycode 7 = +g +G semicolon Control_g Control_g
9keycode 8 = +h +H colon BackSpace BackSpace
10keycode 9 = +i +I +i Tab Tab
11keycode 10 = +j +J asterisk Linefeed Linefeed
12keycode 11 = +k +K backslash Control_k Control_k
13keycode 12 = +l +L bar Control_l Control_l
14keycode 13 = +m +M +m Control_m Control_m
15keycode 14 = +n +N +n Control_n Control_n
16keycode 15 = +o +O +o Control_o Control_o
17keycode 16 = +p +P +p Control_p Control_p
18keycode 17 = +q +Q +q Control_q Control_q
19keycode 18 = +r +R plus Control_r Control_r
20keycode 19 = +s +S +s Control_s Control_s
21keycode 20 = +t +T bracketleft Control_t Control_t
22keycode 21 = +u +U +u Control_u Control_u
23keycode 22 = +v +V +v Control_v Control_v
24keycode 23 = +w +W asciicircum Control_w Control_w
25keycode 24 = +x +X +x Control_x Control_x
26keycode 25 = +y +Y bracketright Control_y Control_y
27keycode 26 = +z +Z +z Control_z Control_z
28keycode 27 = Shift Shift Shift Shift Shift
29keycode 28 = Return Return Return Return Return
30keycode 29 = F11 F11 F11 F11 F11
31keycode 30 = AltGr AltGr AltGr AltGr AltGr
32keycode 31 = BackSpace BackSpace Delete BackSpace BackSpace
33keycode 32 = Num_Lock Num_Lock Num_Lock Num_Lock Num_Lock
34keycode 33 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
35keycode 34 = Escape Escape Escape Escape Escape
36keycode 35 = Left Left Left Left Left Decr_Console
37keycode 36 = Up Up PageUp Up Up
38keycode 37 = Down Down PageDown Down Down
39keycode 38 = Right Right Right Right Right Incr_Console
40keycode 39 = Return Return Return Return Return
41keycode 40 = F12 VoidSymbol VoidSymbol VoidSymbol VoidSymbol
42keycode 41 = one exclam VoidSymbol VoidSymbol VoidSymbol Console_1
43keycode 42 = two quotedbl VoidSymbol VoidSymbol VoidSymbol Console_2
44keycode 43 = three numbersign VoidSymbol VoidSymbol VoidSymbol Console_3
45keycode 44 = four dollar VoidSymbol VoidSymbol VoidSymbol Console_4
46keycode 45 = five percent VoidSymbol VoidSymbol VoidSymbol Console_5
47keycode 46 = six ampersand VoidSymbol VoidSymbol VoidSymbol
48keycode 47 = seven apostrophe VoidSymbol VoidSymbol VoidSymbol
49keycode 48 = eight parenleft VoidSymbol VoidSymbol VoidSymbol
50keycode 49 = nine parenright VoidSymbol VoidSymbol VoidSymbol
51keycode 50 = zero asciitilde VoidSymbol VoidSymbol VoidSymbol
52keycode 51 = minus equal VoidSymbol VoidSymbol VoidSymbol
53keycode 52 = asciicircum asciitilde VoidSymbol VoidSymbol VoidSymbol
54keycode 53 = backslash bar VoidSymbol VoidSymbol VoidSymbol
55keycode 54 = bracketleft braceleft VoidSymbol VoidSymbol VoidSymbol
56keycode 55 = at grave VoidSymbol VoidSymbol VoidSymbol
57keycode 56 = Control Control Control Control Control
58keycode 57 = Alt Alt Alt Alt Alt
59keycode 58 = Control Control Control Control Control
60keycode 59 = minus VoidSymbol at VoidSymbol VoidSymbol
61keycode 60 = Shift_Lock Shift_Lock Shift_Lock Shift_Lock Shift_Lock
62keycode 61 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
63keycode 62 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
64keycode 63 = comma slash less VoidSymbol VoidSymbol
65keycode 64 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
66keycode 65 = Tab Tab Caps_Lock Tab Tab
67keycode 66 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
68keycode 67 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
69keycode 68 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
70keycode 69 = Alt VoidSymbol VoidSymbol VoidSymbol VoidSymbol
71keycode 70 = slash VoidSymbol VoidSymbol VoidSymbol VoidSymbol
72keycode 71 = KP_1 KP_1 KP_1 KP_1 KP_1
73keycode 72 = KP_2 KP_2 KP_2 KP_2 KP_2
74keycode 73 = KP_3 KP_3 KP_3 KP_3 KP_3
75keycode 74 = KP_4 KP_4 KP_4 KP_4 KP_4
76keycode 75 = KP_5 KP_5 KP_5 KP_5 KP_5
77keycode 76 = KP_6 KP_6 KP_6 KP_6 KP_6
78keycode 77 = KP_7 KP_7 KP_7 KP_7 KP_7
79keycode 78 = KP_8 KP_8 KP_8 KP_8 KP_8
80keycode 79 = KP_9 KP_9 KP_9 KP_9 KP_9
81keycode 80 = KP_0 KP_0 KP_0 KP_0 KP_0
82keycode 81 = Delete Delete Delete Delete Delete
83keycode 82 = KP_Divide KP_Divide KP_Divide KP_Divide KP_Divide
84keycode 83 = KP_Multiply KP_Multiply KP_Multiply KP_Multiply KP_Multiply
85keycode 84 = Return Return Return Return Return
86keycode 85 = KP_Subtract KP_Subtract KP_Subtract KP_Subtract KP_Subtract
87keycode 86 = KP_Add KP_Add KP_Add KP_Add KP_Add
88keycode 87 = KP_Enter KP_Enter KP_Enter KP_Enter KP_Enter
89keycode 88 = F9 F9 F9 F9 F9
90keycode 89 = F10 F10 F10 F10 F10
91keycode 90 = F13 F13 F13 F13 F13
92keycode 91 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
93keycode 92 = space space space space space
94keycode 93 = KP_Period KP_Period KP_Period KP_Period KP_Period
95keycode 94 = Escape Escape Escape Escape
96keycode 95 = semicolon plus VoidSymbol VoidSymbol VoidSymbol
97keycode 96 = colon asterisk VoidSymbol VoidSymbol VoidSymbol
98keycode 97 = bracketright braceright VoidSymbol VoidSymbol VoidSymbol
99keycode 98 = comma less VoidSymbol VoidSymbol VoidSymbol
100keycode 99 = period greater VoidSymbol VoidSymbol VoidSymbol
101keycode 100 = slash question VoidSymbol VoidSymbol VoidSymbol
102keycode 101 = underscore underscore VoidSymbol VoidSymbol VoidSymbol
103keycode 102 = F15 VoidSymbol VoidSymbol VoidSymbol VoidSymbol
104keycode 103 = period question greater VoidSymbol VoidSymbol
105keycode 104 = Find Find Find Find Find
106keycode 105 = Select Select Select Select Select
107keycode 106 = Prior Scroll_Backward Prior Prior Prior
108keycode 107 = Next Scroll_Forward Next Next Next
109keycode 108 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
110keycode 109 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
111keycode 110 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
112keycode 111 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
113keycode 112 = Shift Shift Shift Shift Shift
114keycode 113 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
115keycode 114 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
116keycode 115 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
117keycode 116 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
118keycode 117 = Control Control Control Control Control
119keycode 118 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
120keycode 119 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
121keycode 120 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
122keycode 121 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
123keycode 122 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
124keycode 123 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
125keycode 124 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
126keycode 125 = Up Up Up Up
127keycode 126 = Down Down Down Down
128keycode 127 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
diff --git a/meta/recipes-bsp/keymaps/files/spitz/keymap-2.6.map b/meta/recipes-bsp/keymaps/files/spitz/keymap-2.6.map
deleted file mode 100644
index 11a0e8b4d3..0000000000
--- a/meta/recipes-bsp/keymaps/files/spitz/keymap-2.6.map
+++ /dev/null
@@ -1,228 +0,0 @@
1# Default kernel keymap. This uses 7 modifier combinations.
2keymaps 0-2,4-5,8,12
3# Change the above line into
4# keymaps 0-2,4-6,8,12
5# in case you want the entries
6# altgr control keycode 83 = Boot
7# altgr control keycode 111 = Boot
8# below.
9#
10keycode 1 =
11keycode 2 = one exclam
12 control alt keycode 2 = Console_1
13keycode 3 = two quotedbl
14 control alt keycode 3 = Console_2
15keycode 4 = three numbersign
16 control alt keycode 4 = Console_3
17keycode 5 = four dollar
18 control alt keycode 5 = Console_4
19keycode 6 = five percent
20 control alt keycode 6 = Console_5
21keycode 7 = six ampersand
22 control alt keycode 7 = Console_6
23keycode 8 = seven apostrophe
24keycode 9 = eight parenleft
25keycode 10 = nine parenright
26keycode 11 = zero asciitilde
27keycode 12 = minus at
28 altgr keycode 12 = at
29keycode 13 =
30keycode 14 = BackSpace
31 altgr keycode 14 = Delete
32keycode 15 = Tab
33 altgr keycode 15 = Caps_Lock
34keycode 16 = q
35keycode 17 = w
36 altgr keycode 17 = asciicircum
37keycode 18 = e
38 altgr keycode 18 = equal
39keycode 19 = r
40 altgr keycode 19 = plus
41keycode 20 = t
42 altgr keycode 20 = bracketleft
43keycode 21 = y
44 altgr keycode 21 = bracketright
45keycode 22 = u
46 altgr keycode 22 = braceleft
47keycode 23 = i
48 altgr keycode 23 = braceright
49keycode 24 = o
50keycode 25 = p
51keycode 26 =
52keycode 27 =
53keycode 28 = Return
54keycode 29 = Control
55keycode 30 = a
56keycode 31 = s
57keycode 32 = d
58keycode 33 = f
59 altgr keycode 33 = backslash
60keycode 34 = g
61 altgr keycode 34 = semicolon
62keycode 35 = h
63 altgr keycode 35 = colon
64keycode 36 = j
65 altgr keycode 36 = asterisk
66keycode 37 = k
67 altgr keycode 37 = backslash
68keycode 38 = l
69 altgr keycode 38 = bar
70keycode 39 =
71keycode 40 =
72keycode 41 =
73keycode 42 = Shift
74keycode 43 =
75keycode 44 = z
76keycode 45 = x
77keycode 46 = c
78keycode 47 = v
79keycode 48 = b
80 altgr keycode 48 = underscore
81keycode 49 = n
82keycode 50 = m
83keycode 51 = comma slash
84 altgr keycode 51 = less
85keycode 52 = period question
86 altgr keycode 52 = greater
87keycode 53 =
88keycode 54 = Shift
89keycode 55 =
90keycode 56 = Alt
91keycode 57 = space space
92 control keycode 57 = nul
93keycode 59 = F9
94keycode 60 = F10
95keycode 61 = AltGr
96keycode 62 = Escape
97keycode 63 = Return
98keycode 64 = Escape
99keycode 65 = Down
100keycode 66 = Up
101keycode 67 = Control
102keycode 68 = F13
103keycode 79 = F15
104keycode 80 = F16
105keycode 82 = F17
106keycode 87 = Return
107keycode 88 = F11
108keycode 97 = Control
109keycode 99 = F12
110keycode 103 = Up
111 altgr keycode 103 = PageUp
112keycode 105 = Left
113 altgr keycode 105 = Decr_Console
114keycode 106 = Right
115 altgr keycode 106 = Incr_Console
116keycode 108 = Down
117 altgr keycode 108 = PageDown
118
119
120# LCD Softkeys as represented by zaurusd
121keycode 82 = F5
122keycode 79 = F15 # Home
123keycode 80 = F6
124keycode 81 = F16 # Email
125keycode 75 = F7
126keycode 76 = F17 # Addresses
127keycode 77 = F8
128keycode 71 = F18 # Calendar
129keycode 72 = F9
130keycode 73 = F19 # Book
131keycode 78 = F10
132
133string F1 = "\033[[A"
134string F2 = "\033[[B"
135string F3 = "\033[[C"
136string F4 = "\033[[D"
137string F5 = "\033[[E"
138string F6 = "\033[17~"
139string F7 = "\033[18~"
140string F8 = "\033[19~"
141string F9 = "\033[20~"
142string F10 = "\033[21~"
143string F11 = "\033[23~"
144string F12 = "\033[24~"
145string F13 = "\033[25~"
146string F14 = "\033[26~"
147string F15 = "\033[28~"
148string F16 = "\033[29~"
149string F17 = "\033[31~"
150string F18 = "\033[32~"
151string F19 = "\033[33~"
152string F20 = "\033[34~"
153string Find = "\033[1~"
154string Insert = "\033[2~"
155string Remove = "\033[3~"
156string Select = "\033[4~"
157string Prior = "\033[5~"
158string Next = "\033[6~"
159string Macro = "\033[M"
160string Pause = "\033[P"
161compose '`' 'A' to 'À'
162compose '`' 'a' to 'à'
163compose '\'' 'A' to 'Á'
164compose '\'' 'a' to 'á'
165compose '^' 'A' to 'Â'
166compose '^' 'a' to 'â'
167compose '~' 'A' to 'Ã'
168compose '~' 'a' to 'ã'
169compose '"' 'A' to 'Ä'
170compose '"' 'a' to 'ä'
171compose 'O' 'A' to 'Å'
172compose 'o' 'a' to 'å'
173compose '0' 'A' to 'Å'
174compose '0' 'a' to 'å'
175compose 'A' 'A' to 'Å'
176compose 'a' 'a' to 'å'
177compose 'A' 'E' to 'Æ'
178compose 'a' 'e' to 'æ'
179compose ',' 'C' to 'Ç'
180compose ',' 'c' to 'ç'
181compose '`' 'E' to 'È'
182compose '`' 'e' to 'è'
183compose '\'' 'E' to 'É'
184compose '\'' 'e' to 'é'
185compose '^' 'E' to 'Ê'
186compose '^' 'e' to 'ê'
187compose '"' 'E' to 'Ë'
188compose '"' 'e' to 'ë'
189compose '`' 'I' to 'Ì'
190compose '`' 'i' to 'ì'
191compose '\'' 'I' to 'Í'
192compose '\'' 'i' to 'í'
193compose '^' 'I' to 'Î'
194compose '^' 'i' to 'î'
195compose '"' 'I' to 'Ï'
196compose '"' 'i' to 'ï'
197compose '-' 'D' to 'Ð'
198compose '-' 'd' to 'ð'
199compose '~' 'N' to 'Ñ'
200compose '~' 'n' to 'ñ'
201compose '`' 'O' to 'Ò'
202compose '`' 'o' to 'ò'
203compose '\'' 'O' to 'Ó'
204compose '\'' 'o' to 'ó'
205compose '^' 'O' to 'Ô'
206compose '^' 'o' to 'ô'
207compose '~' 'O' to 'Õ'
208compose '~' 'o' to 'õ'
209compose '"' 'O' to 'Ö'
210compose '"' 'o' to 'ö'
211compose '/' 'O' to 'Ø'
212compose '/' 'o' to 'ø'
213compose '`' 'U' to 'Ù'
214compose '`' 'u' to 'ù'
215compose '\'' 'U' to 'Ú'
216compose '\'' 'u' to 'ú'
217compose '^' 'U' to 'Û'
218compose '^' 'u' to 'û'
219compose '"' 'U' to 'Ü'
220compose '"' 'u' to 'ü'
221compose '\'' 'Y' to 'Ý'
222compose '\'' 'y' to 'ý'
223compose 'T' 'H' to 'Þ'
224compose 't' 'h' to 'þ'
225compose 's' 's' to 'ß'
226compose '"' 'y' to 'ÿ'
227compose 's' 'z' to 'ß'
228compose 'i' 'j' to 'ÿ'
diff --git a/meta/recipes-bsp/keymaps/files/tosa/keymap-2.4.map b/meta/recipes-bsp/keymaps/files/tosa/keymap-2.4.map
deleted file mode 100644
index 31ca75b660..0000000000
--- a/meta/recipes-bsp/keymaps/files/tosa/keymap-2.4.map
+++ /dev/null
@@ -1,133 +0,0 @@
1keymaps 0-2,4-5
2alt_is_meta
3keycode 1 = a
4keycode 2 = b
5keycode 3 = c
6keycode 4 = d
7keycode 5 = e
8keycode 6 = f
9keycode 7 = g
10keycode 8 = h
11keycode 9 = i
12keycode 10 = j
13keycode 11 = k
14keycode 12 = l
15keycode 13 = m
16keycode 14 = n
17keycode 15 = o
18keycode 16 = p
19keycode 17 = q
20keycode 18 = r
21keycode 19 = s
22keycode 20 = t
23keycode 21 = u
24keycode 22 = v
25keycode 23 = w
26keycode 24 = x
27keycode 25 = y
28keycode 26 = z
29keycode 27 = Shift
30keycode 28 = Return
31keycode 29 = F11
32keycode 30 = AltGr
33keycode 31 = BackSpace
34keycode 32 = Num_Lock
35keycode 33 = F15
36keycode 34 = Escape
37keycode 35 = Left
38 altgr keycode 35 = Decr_Console
39keycode 36 = Up
40keycode 37 = Down
41keycode 38 = Right
42 altgr keycode 38 = Incr_Console
43keycode 39 = Return
44keycode 40 = F12
45keycode 41 = one exclam one
46keycode 42 = two quotedbl two
47keycode 43 = three numbersign three
48keycode 44 = four dollar four
49keycode 45 = five percent five
50keycode 46 = six ampersand six
51keycode 47 = seven apostrophe seven
52keycode 48 = eight parenleft eight
53keycode 49 = nine parenright nine
54keycode 50 = zero asciitilde zero
55keycode 51 = minus equal
56keycode 52 = asciicircum asciitilde
57keycode 53 = backslash bar
58keycode 54 = bracketleft braceleft
59keycode 55 = at grave
60keycode 56 = Control
61keycode 57 = Alt
62keycode 58 = minus
63keycode 59 = plus
64keycode 60 = Caps_Lock
65keycode 61 = at
66keycode 62 = question
67keycode 63 = comma
68keycode 64 = period
69keycode 65 = Tab
70keycode 66 = F5
71keycode 67 = F6
72keycode 68 = F7
73keycode 69 = slash
74keycode 70 = apostrophe
75keycode 71 = semicolon
76keycode 72 = quotedbl
77keycode 73 = colon
78keycode 74 = numbersign
79keycode 75 = dollar
80keycode 76 = percent
81keycode 77 = underscore
82keycode 78 = ampersand
83keycode 79 = asterisk
84keycode 80 = parenleft
85keycode 81 = Delete
86keycode 82 = F10
87keycode 83 = equal
88keycode 84 = parenright
89keycode 85 = asciitilde
90keycode 86 = less
91keycode 87 = greater
92keycode 88 = F9
93keycode 89 = F10
94keycode 90 = F13
95keycode 91 = space
96 control keycode 91 = nul
97keycode 92 = space
98 control keycode 92 = nul
99keycode 93 =
100keycode 94 = exclam
101keycode 95 = semicolon
102keycode 96 = colon
103keycode 97 = bracketright
104keycode 98 = comma
105keycode 99 = period
106keycode 100 = slash
107keycode 101 = underscore
108keycode 102 = F15
109keycode 103 = Shift
110keycode 104 = Find
111keycode 105 = Select
112keycode 106 = Prior
113keycode 107 = Next
114keycode 108 = AltGr
115keycode 109 = F31
116keycode 110 =
117keycode 111 =
118keycode 112 = Shift
119keycode 113 =
120keycode 114 =
121keycode 115 =
122keycode 116 = underscore
123keycode 117 = Control
124keycode 118 =
125keycode 119 =
126keycode 120 = F24
127keycode 121 = Left
128keycode 122 = Up
129keycode 123 = Down
130keycode 124 = Right
131keycode 125 = Up
132keycode 126 = Down
133keycode 127 =
diff --git a/meta/recipes-bsp/keymaps/files/tosa/keymap-2.6.map b/meta/recipes-bsp/keymaps/files/tosa/keymap-2.6.map
deleted file mode 100644
index b85d5616e5..0000000000
--- a/meta/recipes-bsp/keymaps/files/tosa/keymap-2.6.map
+++ /dev/null
@@ -1,210 +0,0 @@
1# Default kernel keymap. This uses 7 modifier combinations.
2keymaps 0-2,4-5,8,12
3# Change the above line into
4# keymaps 0-2,4-6,8,12
5# in case you want the entries
6# altgr control keycode 83 = Boot
7# altgr control keycode 111 = Boot
8# below.
9#
10keycode 1 =
11keycode 14 = BackSpace
12 altgr keycode 14 = Delete
13keycode 15 = Tab
14 altgr keycode 65 = Caps_Lock
15keycode 16 = q
16 altgr keycode 16 = one
17keycode 17 = w
18 altgr keycode 17 = two
19keycode 18 = e
20 altgr keycode 18 = three
21keycode 19 = r
22 altgr keycode 19 = four
23keycode 20 = t
24 altgr keycode 20 = five
25keycode 21 = y
26 altgr keycode 21 = six
27keycode 22 = u
28 altgr keycode 22 = seven
29keycode 23 = i
30 altgr keycode 23 = eight
31keycode 24 = o
32 altgr keycode 24 = nine
33keycode 25 = p
34 altgr keycode 25 = zero
35keycode 26 =
36keycode 27 =
37keycode 28 = Return
38 altgr keycode 28 = greater
39keycode 29 = Control
40keycode 30 = a
41 altgr keycode 30 = exclam
42keycode 31 = s
43 altgr keycode 31 = at
44keycode 32 = d
45 altgr keycode 32 = numbersign
46keycode 33 = f
47 altgr keycode 33 = dollar
48keycode 34 = g
49 altgr keycode 34 = percent
50keycode 35 = h
51 altgr keycode 35 = underscore
52keycode 36 = j
53 altgr keycode 36 = ampersand
54keycode 37 = k
55 altgr keycode 37 = asterisk
56keycode 38 = l
57 altgr keycode 38 = parenleft
58keycode 39 =
59keycode 40 = apostrophe
60 altgr keycode 40 = asciitilde
61 shift keycode 40 = quotedbl
62keycode 41 =
63keycode 42 = Shift
64keycode 43 =
65keycode 44 = z
66keycode 45 = x
67keycode 46 = c
68keycode 47 = v
69keycode 48 = b
70 altgr keycode 48 = minus
71keycode 49 = n
72 altgr keycode 49 = plus
73keycode 50 = m
74 altgr keycode 50 = equal
75keycode 51 = comma
76 altgr keycode 51 = parenright
77 shift keycode 51 = semicolon
78keycode 52 = period
79 shift keycode 52 = colon
80 altgr keycode 52 = less
81
82keycode 53 = slash
83 shift keycode 53 = question
84 altgr keycode 53 = Num_Lock
85
86keycode 54 = Shift
87keycode 55 =
88keycode 56 = Alt
89keycode 57 = space space
90 control keycode 57 = nul
91 altgr keycode 57 = bar
92keycode 59 = F9
93keycode 60 = F10
94keycode 61 = AltGr
95keycode 62 = Escape
96keycode 63 = space
97keycode 64 = Control
98keycode 65 = F15
99keycode 66 = F24
100keycode 67 = F12
101keycode 68 = F13
102keycode 79 = F15
103keycode 80 = F16
104keycode 82 = F17
105keycode 87 = Return
106keycode 88 = F11
107keycode 97 = Control
108keycode 99 = F12
109keycode 103 = Up
110keycode 105 = Left
111 altgr keycode 105 = Decr_Console
112keycode 106 = Right
113 altgr keycode 106 = Incr_Console
114keycode 108 = Down
115string F1 = "\033[[A"
116string F2 = "\033[[B"
117string F3 = "\033[[C"
118string F4 = "\033[[D"
119string F5 = "\033[[E"
120string F6 = "\033[17~"
121string F7 = "\033[18~"
122string F8 = "\033[19~"
123string F9 = "\033[20~"
124string F10 = "\033[21~"
125string F11 = "\033[23~"
126string F12 = "\033[24~"
127string F13 = "\033[25~"
128string F14 = "\033[26~"
129string F15 = "\033[28~"
130string F16 = "\033[29~"
131string F17 = "\033[31~"
132string F18 = "\033[32~"
133string F19 = "\033[33~"
134string F20 = "\033[34~"
135string Find = "\033[1~"
136string Insert = "\033[2~"
137string Remove = "\033[3~"
138string Select = "\033[4~"
139string Prior = "\033[5~"
140string Next = "\033[6~"
141string Macro = "\033[M"
142string Pause = "\033[P"
143compose '`' 'A' to 'À'
144compose '`' 'a' to 'à'
145compose '\'' 'A' to 'Á'
146compose '\'' 'a' to 'á'
147compose '^' 'A' to 'Â'
148compose '^' 'a' to 'â'
149compose '~' 'A' to 'Ã'
150compose '~' 'a' to 'ã'
151compose '"' 'A' to 'Ä'
152compose '"' 'a' to 'ä'
153compose 'O' 'A' to 'Å'
154compose 'o' 'a' to 'å'
155compose '0' 'A' to 'Å'
156compose '0' 'a' to 'å'
157compose 'A' 'A' to 'Å'
158compose 'a' 'a' to 'å'
159compose 'A' 'E' to 'Æ'
160compose 'a' 'e' to 'æ'
161compose ',' 'C' to 'Ç'
162compose ',' 'c' to 'ç'
163compose '`' 'E' to 'È'
164compose '`' 'e' to 'è'
165compose '\'' 'E' to 'É'
166compose '\'' 'e' to 'é'
167compose '^' 'E' to 'Ê'
168compose '^' 'e' to 'ê'
169compose '"' 'E' to 'Ë'
170compose '"' 'e' to 'ë'
171compose '`' 'I' to 'Ì'
172compose '`' 'i' to 'ì'
173compose '\'' 'I' to 'Í'
174compose '\'' 'i' to 'í'
175compose '^' 'I' to 'Î'
176compose '^' 'i' to 'î'
177compose '"' 'I' to 'Ï'
178compose '"' 'i' to 'ï'
179compose '-' 'D' to 'Ð'
180compose '-' 'd' to 'ð'
181compose '~' 'N' to 'Ñ'
182compose '~' 'n' to 'ñ'
183compose '`' 'O' to 'Ò'
184compose '`' 'o' to 'ò'
185compose '\'' 'O' to 'Ó'
186compose '\'' 'o' to 'ó'
187compose '^' 'O' to 'Ô'
188compose '^' 'o' to 'ô'
189compose '~' 'O' to 'Õ'
190compose '~' 'o' to 'õ'
191compose '"' 'O' to 'Ö'
192compose '"' 'o' to 'ö'
193compose '/' 'O' to 'Ø'
194compose '/' 'o' to 'ø'
195compose '`' 'U' to 'Ù'
196compose '`' 'u' to 'ù'
197compose '\'' 'U' to 'Ú'
198compose '\'' 'u' to 'ú'
199compose '^' 'U' to 'Û'
200compose '^' 'u' to 'û'
201compose '"' 'U' to 'Ü'
202compose '"' 'u' to 'ü'
203compose '\'' 'Y' to 'Ý'
204compose '\'' 'y' to 'ý'
205compose 'T' 'H' to 'Þ'
206compose 't' 'h' to 'þ'
207compose 's' 's' to 'ß'
208compose '"' 'y' to 'ÿ'
209compose 's' 'z' to 'ß'
210compose 'i' 'j' to 'ÿ'
diff --git a/meta/recipes-bsp/keymaps/keymaps_1.0.bb b/meta/recipes-bsp/keymaps/keymaps_1.0.bb
index 7f2211a2b9..4683fa1d3a 100644
--- a/meta/recipes-bsp/keymaps/keymaps_1.0.bb
+++ b/meta/recipes-bsp/keymaps/keymaps_1.0.bb
@@ -5,35 +5,17 @@ RDEPENDS_${PN} = "initscripts console-tools"
5LICENSE = "GPLv2" 5LICENSE = "GPLv2"
6LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" 6LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
7PACKAGE_ARCH = "${MACHINE_ARCH}" 7PACKAGE_ARCH = "${MACHINE_ARCH}"
8PR = "r18" 8PR = "r19"
9 9
10inherit update-rc.d 10inherit update-rc.d
11 11
12SRC_URI = "file://keymap.sh \ 12SRC_URI = "file://keymap.sh \
13 file://GPLv2.patch" 13 file://GPLv2.patch"
14 14
15SRC_URI_append_c7x0 = " file://keymap-*.map"
16SRC_URI_append_tosa = " file://keymap-*.map"
17SRC_URI_append_akita = " file://keymap-*.map"
18SRC_URI_append_spitz = " file://keymap-*.map"
19SRC_URI_append_collie = " file://keymap-*.map"
20SRC_URI_append_poodle = " file://keymap-*.map"
21SRC_URI_append_jornada6xx = " file://keymap-*.map"
22SRC_URI_append_h2200 = " file://keymap-*.map"
23SRC_URI_append_htcuniversal = " file://keymap-*.map"
24
25INITSCRIPT_NAME = "keymap.sh" 15INITSCRIPT_NAME = "keymap.sh"
26INITSCRIPT_PARAMS = "start 01 S ." 16INITSCRIPT_PARAMS = "start 01 S ."
27 17
28do_install () { 18do_install () {
29 install -d ${D}${sysconfdir}/init.d/ 19 install -d ${D}${sysconfdir}/init.d/
30 install -m 0755 ${WORKDIR}/keymap.sh ${D}${sysconfdir}/init.d/ 20 install -m 0755 ${WORKDIR}/keymap.sh ${D}${sysconfdir}/init.d/
31
32 case ${MACHINE} in
33 c7x0 | tosa | spitz | akita | borzoi | collie | poodle | jornada6xx | h2200 | htcuniversal )
34 install -m 0644 ${WORKDIR}/keymap-*.map ${D}${sysconfdir}
35 ;;
36 *)
37 ;;
38 esac
39} 21}
diff --git a/meta/recipes-bsp/pointercal/files/akita/pointercal b/meta/recipes-bsp/pointercal/files/akita/pointercal
deleted file mode 100644
index 89f407efbd..0000000000
--- a/meta/recipes-bsp/pointercal/files/akita/pointercal
+++ /dev/null
@@ -1 +0,0 @@
112 -8946 33795672 12135 73 -2444604 65536
diff --git a/meta/recipes-bsp/pointercal/files/c7x0/pointercal b/meta/recipes-bsp/pointercal/files/c7x0/pointercal
deleted file mode 100644
index eb99f6075c..0000000000
--- a/meta/recipes-bsp/pointercal/files/c7x0/pointercal
+++ /dev/null
@@ -1 +0,0 @@
112572 -34 -2892400 5 8615 -1959428 65536
diff --git a/meta/recipes-bsp/pointercal/files/htcuniversal/pointercal b/meta/recipes-bsp/pointercal/files/htcuniversal/pointercal
deleted file mode 100644
index f78c816e01..0000000000
--- a/meta/recipes-bsp/pointercal/files/htcuniversal/pointercal
+++ /dev/null
@@ -1 +0,0 @@
1-1143 6 34078032 0 1470 -2677528 65536
diff --git a/meta/recipes-bsp/pointercal/files/om-gta01/pointercal b/meta/recipes-bsp/pointercal/files/om-gta01/pointercal
deleted file mode 100644
index 198fd2a776..0000000000
--- a/meta/recipes-bsp/pointercal/files/om-gta01/pointercal
+++ /dev/null
@@ -1 +0,0 @@
1-67 36365 -2733100 -48253 -310 45219816 65536
diff --git a/meta/recipes-bsp/pointercal/files/omap-3430ldp/pointercal b/meta/recipes-bsp/pointercal/files/omap-3430ldp/pointercal
deleted file mode 100644
index 42cf01b857..0000000000
--- a/meta/recipes-bsp/pointercal/files/omap-3430ldp/pointercal
+++ /dev/null
@@ -1 +0,0 @@
1-15 8748 -1858708 11310 31 -2326312 65536
diff --git a/meta/recipes-bsp/pointercal/files/spitz/pointercal b/meta/recipes-bsp/pointercal/files/spitz/pointercal
deleted file mode 100644
index 7e9f7a8468..0000000000
--- a/meta/recipes-bsp/pointercal/files/spitz/pointercal
+++ /dev/null
@@ -1 +0,0 @@
116 -8880 34043380 12130 72 -2479548 65536
diff --git a/meta/recipes-core/base-files/base-files/akita/fstab b/meta/recipes-core/base-files/base-files/akita/fstab
deleted file mode 100644
index 5f2c941345..0000000000
--- a/meta/recipes-core/base-files/base-files/akita/fstab
+++ /dev/null
@@ -1,16 +0,0 @@
1/dev/mtdblock2 / jffs2 rw,noatime 1 1
2/dev/mtdblock3 /home jffs2 defaults,noatime 1 2
3proc /proc proc defaults 0 0
4/dev/hda1 /media/cf auto defaults,sync,noauto 0 0
5
6tmpfs /var/volatile tmpfs defaults 0 0
7tmpfs /media/ram tmpfs defaults 0 0
8
9# SD/MMC in kernel 2.4
10/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0
11# SD/MMC in kernel 2.6
12/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0
13
14# USB Storage
15/dev/sda1 /media/usbhdd vfat noauto,umask=000,noatime,iocharset=utf8,codepage=932 0 0
16
diff --git a/meta/recipes-core/base-files/base-files/akita/rotation b/meta/recipes-core/base-files/base-files/akita/rotation
deleted file mode 100644
index 2a14d60899..0000000000
--- a/meta/recipes-core/base-files/base-files/akita/rotation
+++ /dev/null
@@ -1 +0,0 @@
1270 \ No newline at end of file
diff --git a/meta/recipes-core/base-files/base-files/c7x0/fstab b/meta/recipes-core/base-files/base-files/c7x0/fstab
deleted file mode 100644
index e065e8112e..0000000000
--- a/meta/recipes-core/base-files/base-files/c7x0/fstab
+++ /dev/null
@@ -1,12 +0,0 @@
1/dev/mtdblock2 / jffs2 rw,noatime 1 1
2/dev/mtdblock3 /home jffs2 defaults,noatime 1 2
3proc /proc proc defaults 0 0
4/dev/hda1 /media/cf auto defaults,sync,noauto 0 0
5
6tmpfs /var/volatile tmpfs defaults 0 0
7tmpfs /media/ram tmpfs defaults 0 0
8
9# SD/MMC in kernel 2.4
10/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0
11# SD/MMC in kernel 2.6
12/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0
diff --git a/meta/recipes-core/base-files/base-files/c7x0/usbd b/meta/recipes-core/base-files/base-files/c7x0/usbd
deleted file mode 100644
index 40931ee8e9..0000000000
--- a/meta/recipes-core/base-files/base-files/c7x0/usbd
+++ /dev/null
@@ -1 +0,0 @@
1usbdmodule=pxa_bi
diff --git a/meta/recipes-core/base-files/base-files/collie/fstab b/meta/recipes-core/base-files/base-files/collie/fstab
deleted file mode 100644
index dc3499b909..0000000000
--- a/meta/recipes-core/base-files/base-files/collie/fstab
+++ /dev/null
@@ -1,8 +0,0 @@
1/dev/mtdblock4 / jffs2 defaults 1 1
2proc /proc proc defaults 0 0
3/dev/hda1 /media/cf auto defaults,sync,noauto,noatime,user,exec,suid,gid=100,umask=0002 0 0
4/dev/mmcda1 /media/card auto defaults,sync,noauto,noatime,user,exec,suid 0 0
5tmpfs /var/volatile tmpfs defaults 0 0
6
7# we use a non-volatile ramdisk, see /etc/init.d/ramdisk
8#tmpfs /media/ram tmpfs defaults 0 0
diff --git a/meta/recipes-core/base-files/base-files/collie/usbd b/meta/recipes-core/base-files/base-files/collie/usbd
deleted file mode 100644
index 4257614583..0000000000
--- a/meta/recipes-core/base-files/base-files/collie/usbd
+++ /dev/null
@@ -1 +0,0 @@
1usbdmodule=sa1100_bi
diff --git a/meta/recipes-core/base-files/base-files/htcuniversal/rotation b/meta/recipes-core/base-files/base-files/htcuniversal/rotation
deleted file mode 100644
index 2a14d60899..0000000000
--- a/meta/recipes-core/base-files/base-files/htcuniversal/rotation
+++ /dev/null
@@ -1 +0,0 @@
1270 \ No newline at end of file
diff --git a/meta/recipes-core/base-files/base-files/hx2000/fstab b/meta/recipes-core/base-files/base-files/hx2000/fstab
deleted file mode 100644
index 2d4b7aae72..0000000000
--- a/meta/recipes-core/base-files/base-files/hx2000/fstab
+++ /dev/null
@@ -1,9 +0,0 @@
1/dev/mtdblock2 / jffs2 defaults 1 1
2/dev/mtdblock3 /home jffs2 defaults 1 1
3
4proc /proc proc defaults 0 0
5sys /sys sysfs defaults 0 0
6
7/dev/hda1 /media/cf auto defaults,noauto,noatime,exec,suid 0 0
8tmpfs /var/volatile tmpfs defaults 0 0
9tmpfs /media/ram tmpfs defaults 0 0
diff --git a/meta/recipes-core/base-files/base-files/mtx-1/fstab b/meta/recipes-core/base-files/base-files/mtx-1/fstab
deleted file mode 100644
index ee3fab0c13..0000000000
--- a/meta/recipes-core/base-files/base-files/mtx-1/fstab
+++ /dev/null
@@ -1,8 +0,0 @@
1# /etc/fstab: static file system information. mtx-1
2#
3# <file system> <mount pt> <type> <options> <dump> <pass>
4rootfs / auto defaults 1 1
5tmpfs /var/volatile tmpfs size=10m 0 0
6proc /proc proc defaults 0 0
7devpts /dev/pts devpts mode=0620,gid=5 0 0
8usbdevfs /proc/bus/usb usbdevfs noauto 0 0
diff --git a/meta/recipes-core/base-files/base-files/mtx-1/profile b/meta/recipes-core/base-files/base-files/mtx-1/profile
deleted file mode 100644
index bedf2fc7d8..0000000000
--- a/meta/recipes-core/base-files/base-files/mtx-1/profile
+++ /dev/null
@@ -1,25 +0,0 @@
1# /etc/profile: system-wide .profile file for the Bourne shell (sh(1))
2# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...).
3
4PATH="/usr/local/bin:/usr/bin:/bin"
5
6if [ "`id -u`" -eq 0 ]; then
7 PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin:
8fi
9if [ "$PS1" ]; then
10# works for bash and ash (no other shells known to be in use here)
11 PS1='\u@\h:\w\$ '
12fi
13
14if [ -d /etc/profile.d ]; then
15 for i in `ls /etc/profile.d/`; do
16 . /etc/profile.d/$i
17 done
18 unset i
19fi
20
21export PATH PS1
22
23umask 022
24
25alias ll="ls -lah" \ No newline at end of file
diff --git a/meta/recipes-core/base-files/base-files/nokia770/fstab b/meta/recipes-core/base-files/base-files/nokia770/fstab
deleted file mode 100644
index 7dbae252fb..0000000000
--- a/meta/recipes-core/base-files/base-files/nokia770/fstab
+++ /dev/null
@@ -1,6 +0,0 @@
1rootfs / rootfs defaults,errors=remount-ro,noatime 0 0
2/dev/mmcblk0p1 /media/card auto defaults,noauto,noatime,exec,suid 0 0
3tmpfs /var/volatile tmpfs defaults 0 0
4tmpfs /media/ram tmpfs defaults 0 0
5proc /proc proc defaults 0 0
6usbdevfs /proc/bus/usb usbdevfs noauto 0 0
diff --git a/meta/recipes-core/base-files/base-files/poodle/fstab b/meta/recipes-core/base-files/base-files/poodle/fstab
deleted file mode 100644
index b96b750eb6..0000000000
--- a/meta/recipes-core/base-files/base-files/poodle/fstab
+++ /dev/null
@@ -1,13 +0,0 @@
1/dev/mtdblock2 / jffs2 rw,noatime 1 1
2/dev/mtdblock3 /home jffs2 defaults,noatime 1 2
3proc /proc proc defaults 0 0
4/dev/hda1 /media/cf auto defaults,sync,noauto 0 0
5
6# SD/MMC in kernel 2.6
7/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0
8
9# SD/MMC in kernel 2.4
10/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0
11
12tmpfs /var/volatile tmpfs defaults 0 0
13tmpfs /media/ram tmpfs defaults 0 0
diff --git a/meta/recipes-core/base-files/base-files/poodle/usbd b/meta/recipes-core/base-files/base-files/poodle/usbd
deleted file mode 100644
index 40931ee8e9..0000000000
--- a/meta/recipes-core/base-files/base-files/poodle/usbd
+++ /dev/null
@@ -1 +0,0 @@
1usbdmodule=pxa_bi
diff --git a/meta/recipes-core/base-files/base-files/spitz/fstab b/meta/recipes-core/base-files/base-files/spitz/fstab
deleted file mode 100644
index 3d0e508dfd..0000000000
--- a/meta/recipes-core/base-files/base-files/spitz/fstab
+++ /dev/null
@@ -1,28 +0,0 @@
1# don't mount /dev/mtdblock2 since Spitz uses pivot_root
2# or 2.6 directly boots from the hdd
3# /dev/mtdblock2 / jffs2 rw,noatime 1 1
4rootfs / auto defaults 1 1
5proc /proc proc defaults 0 0
6# we can use a normal var filesystem with a microdrive
7# tmpfs /var tmpfs defaults 0 0
8tmpfs /media/ram tmpfs defaults 0 0
9
10# Compact Flash memory cards
11/dev/hdc1 /media/cf auto defaults,sync,noauto 0 0
12# SD/MMC in kernel 2.4
13/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0
14# SD/MMC in kernel 2.6
15/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0
16
17#
18# USB
19#
20/dev/sda1 /media/usbhdd vfat noauto,umask=000,noatime,iocharset=utf8,codepage=932 0 0
21devpts /dev/pts devpts mode=0620,gid=5 0 0
22usbfs /proc/bus/usb usbfs noauto 0 0
23
24#
25# Harddisk
26#
27/dev/hda2 /home ext3 defaults 0 0
28/dev/hda3 /media/hdd vfat defaults 0 0
diff --git a/meta/recipes-core/base-files/base-files/spitz/rotation b/meta/recipes-core/base-files/base-files/spitz/rotation
deleted file mode 100644
index 2a14d60899..0000000000
--- a/meta/recipes-core/base-files/base-files/spitz/rotation
+++ /dev/null
@@ -1 +0,0 @@
1270 \ No newline at end of file
diff --git a/meta/recipes-core/base-files/base-files/tosa/fstab b/meta/recipes-core/base-files/base-files/tosa/fstab
deleted file mode 100644
index e065e8112e..0000000000
--- a/meta/recipes-core/base-files/base-files/tosa/fstab
+++ /dev/null
@@ -1,12 +0,0 @@
1/dev/mtdblock2 / jffs2 rw,noatime 1 1
2/dev/mtdblock3 /home jffs2 defaults,noatime 1 2
3proc /proc proc defaults 0 0
4/dev/hda1 /media/cf auto defaults,sync,noauto 0 0
5
6tmpfs /var/volatile tmpfs defaults 0 0
7tmpfs /media/ram tmpfs defaults 0 0
8
9# SD/MMC in kernel 2.4
10/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0
11# SD/MMC in kernel 2.6
12/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0
diff --git a/meta/recipes-core/base-files/base-files/tosa/usbd b/meta/recipes-core/base-files/base-files/tosa/usbd
deleted file mode 100644
index 8c80044167..0000000000
--- a/meta/recipes-core/base-files/base-files/tosa/usbd
+++ /dev/null
@@ -1,5 +0,0 @@
1# I know that this was created for usb-client stuff
2# but tosa/2.6 need (un)loading USB Host module
3# on suspend/resume and this way is simplest one ;)
4
5usbdmodule=ohci-hcd
diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb
index 857df13332..1c5078eb77 100644
--- a/meta/recipes-core/base-files/base-files_3.0.14.bb
+++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
@@ -2,7 +2,7 @@ SUMMARY = "Miscellaneous files for the base system."
2DESCRIPTION = "The base-files package creates the basic system directory structure and provides a small set of key configuration files for the system." 2DESCRIPTION = "The base-files package creates the basic system directory structure and provides a small set of key configuration files for the system."
3SECTION = "base" 3SECTION = "base"
4PRIORITY = "required" 4PRIORITY = "required"
5PR = "r67" 5PR = "r68"
6LICENSE = "GPLv2" 6LICENSE = "GPLv2"
7LIC_FILES_CHKSUM = "file://licenses/GPL-2;md5=94d55d512a9ba36caa9b7df079bae19f" 7LIC_FILES_CHKSUM = "file://licenses/GPL-2;md5=94d55d512a9ba36caa9b7df079bae19f"
8SRC_URI = "file://rotation \ 8SRC_URI = "file://rotation \
@@ -64,8 +64,6 @@ conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \
64# 64#
65hostname = "openembedded" 65hostname = "openembedded"
66hostname_slugos = "nslu2" 66hostname_slugos = "nslu2"
67hostname_mnci = "MNCI"
68hostname_rt3000 = "MNRT"
69hostname_jlime = "JLime" 67hostname_jlime = "JLime"
70 68
71BASEFILESISSUEINSTALL ?= "do_install_basefilesissue" 69BASEFILESISSUEINSTALL ?= "do_install_basefilesissue"
@@ -135,11 +133,6 @@ do_install_basefilesissue () {
135 fi 133 fi
136} 134}
137 135
138do_install_append_mnci () {
139 rmdir ${D}/tmp
140 ln -s var/tmp ${D}/tmp
141}
142
143do_install_append_nylon() { 136do_install_append_nylon() {
144 printf "" "" >${D}${sysconfdir}/resolv.conf 137 printf "" "" >${D}${sysconfdir}/resolv.conf
145 rm -r ${D}/mnt/* 138 rm -r ${D}/mnt/*
@@ -156,10 +149,6 @@ do_install_append_slugos() {
156 ln -s ../root ${D}/home/root 149 ln -s ../root ${D}/home/root
157} 150}
158 151
159do_install_append_netbook-pro () {
160 mkdir -p ${D}/initrd
161}
162
163do_install_append_linuxstdbase() { 152do_install_append_linuxstdbase() {
164 for d in ${dirs3755}; do 153 for d in ${dirs3755}; do
165 install -m 0755 -d ${D}$d 154 install -m 0755 -d ${D}$d
@@ -174,10 +163,6 @@ PACKAGES = "${PN}-doc ${PN} ${PN}-dev ${PN}-dbg"
174FILES_${PN} = "/" 163FILES_${PN} = "/"
175FILES_${PN}-doc = "${docdir} ${datadir}/common-licenses" 164FILES_${PN}-doc = "${docdir} ${datadir}/common-licenses"
176 165
177# M&N specific packaging
178PACKAGE_ARCH_mnci = "mnci"
179PACKAGE_ARCH_rt3000 = "rt3000"
180
181PACKAGE_ARCH = "${MACHINE_ARCH}" 166PACKAGE_ARCH = "${MACHINE_ARCH}"
182 167
183# Unslung distribution specific packaging 168# Unslung distribution specific packaging
diff --git a/meta/recipes-core/netbase/netbase-4.45/epia/interfaces b/meta/recipes-core/netbase/netbase-4.45/epia/interfaces
deleted file mode 100644
index 673618f636..0000000000
--- a/meta/recipes-core/netbase/netbase-4.45/epia/interfaces
+++ /dev/null
@@ -1,10 +0,0 @@
1# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
2
3# The loopback interface
4auto lo
5iface lo inet loopback
6
7# Ethernet
8auto eth0
9iface eth0 inet dhcp
10
diff --git a/meta/recipes-core/netbase/netbase-4.45/mtx-1/interfaces b/meta/recipes-core/netbase/netbase-4.45/mtx-1/interfaces
deleted file mode 100644
index a7c6da5752..0000000000
--- a/meta/recipes-core/netbase/netbase-4.45/mtx-1/interfaces
+++ /dev/null
@@ -1,29 +0,0 @@
1# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
2
3# The loopback interface
4auto lo
5iface lo inet loopback
6
7# Ethernet
8auto eth0
9iface eth0 inet dhcp
10
11# wlan interface 1 for clients
12auto wlan0
13iface wlan0 inet static
14 address 10.0.0.1
15 netmask 255.0.0.0
16 wireless_mode master
17 wireless_essid cube-ap
18 wireless_channel 1
19
20# wlan interface 2 for mesh
21auto wlan1
22iface wlan1 inet static
23 address 172.16.0.1
24 netmask 255.240.0.0
25 broadcast 172.31.255.255
26 wireless_mode ad-hoc
27 wireless_essid cube-mesh
28 wireless_channel 11
29 wireless_rts 250
diff --git a/meta/recipes-core/netbase/netbase-4.45/nokia800/interfaces b/meta/recipes-core/netbase/netbase-4.45/nokia800/interfaces
deleted file mode 100644
index 16967763e5..0000000000
--- a/meta/recipes-core/netbase/netbase-4.45/nokia800/interfaces
+++ /dev/null
@@ -1,5 +0,0 @@
1# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
2
3# The loopback interface
4auto lo
5iface lo inet loopback
diff --git a/meta/recipes-core/netbase/netbase-4.45/tosa/interfaces b/meta/recipes-core/netbase/netbase-4.45/tosa/interfaces
deleted file mode 100644
index 0da7168535..0000000000
--- a/meta/recipes-core/netbase/netbase-4.45/tosa/interfaces
+++ /dev/null
@@ -1,24 +0,0 @@
1# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
2
3# The loopback interface
4auto lo
5iface lo inet loopback
6
7# Wireless interfaces
8iface wlan0 inet dhcp
9 wireless_type wlan-ng
10 wireless_mode Managed
11 pre-up modprobe prism2_usb
12# pre-up /sbin/usbctl on 1
13# post-down /sbin/usbctl off 1
14 post-down rmmod prism2_usb
15
16# Wired or wireless interfaces
17iface eth0 inet dhcp
18iface eth1 inet dhcp
19
20# Zaurus usbnet
21iface usbd0 inet dhcp
22
23# usbnet from the other side
24iface usb0 inet dhcp
diff --git a/meta/recipes-core/netbase/netbase-4.45/wrt54/interfaces b/meta/recipes-core/netbase/netbase-4.45/wrt54/interfaces
deleted file mode 100644
index 8b2852ac51..0000000000
--- a/meta/recipes-core/netbase/netbase-4.45/wrt54/interfaces
+++ /dev/null
@@ -1,23 +0,0 @@
1# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
2
3# loopback interface
4auto lo
5iface lo inet loopback
6
7# the 4 LAN ports
8auto vlan0
9iface vlan0 inet static
10 address 192.168.1.1
11 netmask 255.255.255.0
12
13# WAN port
14auto vlan1
15iface vlan1 inet dhcp
16
17# wireless interface
18auto eth1
19iface eth1 inet static
20 wireless_mode master
21 wireless_essid wrt
22 address 10.0.0.1
23 netmask 255.255.255.0
diff --git a/meta/recipes-core/netbase/netbase-4.45/xxs1500/interfaces b/meta/recipes-core/netbase/netbase-4.45/xxs1500/interfaces
deleted file mode 100644
index 23ccccd2dd..0000000000
--- a/meta/recipes-core/netbase/netbase-4.45/xxs1500/interfaces
+++ /dev/null
@@ -1,15 +0,0 @@
1# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
2
3# The loopback interface
4auto lo
5iface lo inet loopback
6
7# Ethernet
8auto eth0 eth1
9iface eth0 inet static
10 address 192.168.127.1
11 netmask 255.255.255.0
12
13iface eth1 inet static
14 address 192.168.128.1
15 netmask 255.255.255.0
diff --git a/meta/recipes-core/netbase/netbase_4.45.bb b/meta/recipes-core/netbase/netbase_4.45.bb
index 319afa7bd2..85daa16e21 100644
--- a/meta/recipes-core/netbase/netbase_4.45.bb
+++ b/meta/recipes-core/netbase/netbase_4.45.bb
@@ -40,7 +40,7 @@ do_install () {
40 40
41 # Disable network manager on machines that commonly do NFS booting 41 # Disable network manager on machines that commonly do NFS booting
42 case "${MACHINE}" in 42 case "${MACHINE}" in
43 "omap-3430sdp" | "omap-3430ldp" | "omap-2430sdp" | "qemuarm" | "qemux86" | "qemux86-64" ) 43 "qemuarm" | "qemux86" | "qemux86-64" | "qemumips" | "qemuppc" )
44 touch ${D}${sysconfdir}/network/nm-disabled-eth0 44 touch ${D}${sysconfdir}/network/nm-disabled-eth0
45 ;; 45 ;;
46 *) 46 *)
@@ -50,9 +50,6 @@ do_install () {
50 50
51CONFFILES_${PN} = "${sysconfdir}/hosts ${sysconfdir}/network/interfaces" 51CONFFILES_${PN} = "${sysconfdir}/hosts ${sysconfdir}/network/interfaces"
52 52
53PACKAGE_ARCH_omap-3430sdp = "${MACHINE_ARCH}"
54PACKAGE_ARCH_omap-3430ldp = "${MACHINE_ARCH}"
55PACKAGE_ARCH_omap-2430sdp = "${MACHINE_ARCH}"
56PACKAGE_ARCH_qemuarm = "${MACHINE_ARCH}" 53PACKAGE_ARCH_qemuarm = "${MACHINE_ARCH}"
57PACKAGE_ARCH_qemux86 = "${MACHINE_ARCH}" 54PACKAGE_ARCH_qemux86 = "${MACHINE_ARCH}"
58PACKAGE_ARCH_qemux86-64 = "${MACHINE_ARCH}" 55PACKAGE_ARCH_qemux86-64 = "${MACHINE_ARCH}"
diff --git a/meta/recipes-core/tasks/task-core-tools.bb b/meta/recipes-core/tasks/task-core-tools.bb
index 9b2a4ce8ee..01e93ece65 100644
--- a/meta/recipes-core/tasks/task-core-tools.bb
+++ b/meta/recipes-core/tasks/task-core-tools.bb
@@ -63,8 +63,6 @@ RRECOMMENDS_task-core-tools-profile = "\
63RDEPENDS_task-core-tools-profile_append_qemux86 = " valgrind lttng-ust systemtap" 63RDEPENDS_task-core-tools-profile_append_qemux86 = " valgrind lttng-ust systemtap"
64RDEPENDS_task-core-tools-profile_append_qemux86-64 = " lttng-ust systemtap" 64RDEPENDS_task-core-tools-profile_append_qemux86-64 = " lttng-ust systemtap"
65RDEPENDS_task-core-tools-profile_append_qemuppc = " lttng-ust systemtap" 65RDEPENDS_task-core-tools-profile_append_qemuppc = " lttng-ust systemtap"
66RDEPENDS_task-core-tools-profile_append_emenlow = " lttng-ust systemtap"
67RDEPENDS_task-core-tools-profile_append_atom-pc = " lttng-ust systemtap"
68 66
69RDEPENDS_task-core-tools-testapps = "\ 67RDEPENDS_task-core-tools-testapps = "\
70 blktool \ 68 blktool \
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/akita/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/akita/uClibc.machine
deleted file mode 100644
index e27931cf6b..0000000000
--- a/meta/recipes-core/uclibc/uclibc-0.9.30.1/akita/uClibc.machine
+++ /dev/null
@@ -1,70 +0,0 @@
1#
2# Automatically generated make config: don't edit
3# Sat May 12 23:18:41 2007
4#
5# TARGET_alpha is not set
6TARGET_arm=y
7# TARGET_bfin is not set
8# TARGET_cris is not set
9# TARGET_e1 is not set
10# TARGET_frv is not set
11# TARGET_h8300 is not set
12# TARGET_hppa is not set
13# TARGET_i386 is not set
14# TARGET_i960 is not set
15# TARGET_ia64 is not set
16# TARGET_m68k is not set
17# TARGET_microblaze is not set
18# TARGET_mips is not set
19# TARGET_nios is not set
20# TARGET_nios2 is not set
21# TARGET_powerpc is not set
22# TARGET_sh is not set
23# TARGET_sh64 is not set
24# TARGET_sparc is not set
25# TARGET_v850 is not set
26# TARGET_vax is not set
27# TARGET_x86_64 is not set
28
29#
30# Target Architecture Features and Options
31#
32TARGET_ARCH="arm"
33FORCE_OPTIONS_FOR_ARCH=y
34# CONFIG_ARM_OABI is not set
35CONFIG_ARM_EABI=y
36USE_BX=y
37# CONFIG_GENERIC_ARM is not set
38# CONFIG_ARM610 is not set
39# CONFIG_ARM710 is not set
40# CONFIG_ARM7TDMI is not set
41# CONFIG_ARM720T is not set
42# CONFIG_ARM920T is not set
43# CONFIG_ARM922T is not set
44# CONFIG_ARM926T is not set
45# CONFIG_ARM10T is not set
46# CONFIG_ARM1136JF_S is not set
47# CONFIG_ARM1176JZ_S is not set
48# CONFIG_ARM1176JZF_S is not set
49# CONFIG_ARM_SA110 is not set
50# CONFIG_ARM_SA1100 is not set
51# CONFIG_ARM_XSCALE is not set
52CONFIG_ARM_IWMMXT=y
53TARGET_SUBARCH=""
54
55#
56# Using ELF file format
57#
58ARCH_ANY_ENDIAN=y
59ARCH_LITTLE_ENDIAN=y
60# ARCH_WANTS_BIG_ENDIAN is not set
61ARCH_WANTS_LITTLE_ENDIAN=y
62ARCH_HAS_MMU=y
63ARCH_USE_MMU=y
64UCLIBC_HAS_FLOATS=y
65# UCLIBC_HAS_FPU is not set
66UCLIBC_HAS_SOFT_FLOAT=y
67DO_C99_MATH=y
68KERNEL_HEADERS="/usr/include"
69HAVE_DOT_CONFIG=y
70
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/atom-pc/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/atom-pc/uClibc.machine
deleted file mode 100644
index 5df15f94cb..0000000000
--- a/meta/recipes-core/uclibc/uclibc-0.9.30.1/atom-pc/uClibc.machine
+++ /dev/null
@@ -1,69 +0,0 @@
1#
2# Automatically generated make config: don't edit
3# Fri Nov 23 15:49:33 2007
4#
5# TARGET_alpha is not set
6# TARGET_arm is not set
7# TARGET_bfin is not set
8# TARGET_cris is not set
9# TARGET_e1 is not set
10# TARGET_frv is not set
11# TARGET_h8300 is not set
12# TARGET_hppa is not set
13TARGET_i386=y
14# TARGET_i960 is not set
15# TARGET_ia64 is not set
16# TARGET_m68k is not set
17# TARGET_microblaze is not set
18# TARGET_mips is not set
19# TARGET_nios is not set
20# TARGET_nios2 is not set
21# TARGET_powerpc is not set
22# TARGET_sh is not set
23# TARGET_sh64 is not set
24# TARGET_sparc is not set
25# TARGET_v850 is not set
26# TARGET_vax is not set
27# TARGET_x86_64 is not set
28
29#
30# Target Architecture Features and Options
31#
32TARGET_ARCH="i386"
33FORCE_OPTIONS_FOR_ARCH=y
34CONFIG_GENERIC_386=y
35# CONFIG_386 is not set
36# CONFIG_486 is not set
37# CONFIG_586 is not set
38# CONFIG_586MMX is not set
39# CONFIG_686 is not set
40# CONFIG_PENTIUMII is not set
41# CONFIG_PENTIUMIII is not set
42# CONFIG_PENTIUM4 is not set
43# CONFIG_K6 is not set
44# CONFIG_K7 is not set
45# CONFIG_ELAN is not set
46# CONFIG_CRUSOE is not set
47# CONFIG_WINCHIPC6 is not set
48# CONFIG_WINCHIP2 is not set
49# CONFIG_CYRIXIII is not set
50# CONFIG_NEHEMIAH is not set
51TARGET_SUBARCH=""
52
53#
54# Using ELF file format
55#
56ARCH_LITTLE_ENDIAN=y
57
58#
59# Using Little Endian
60#
61ARCH_HAS_MMU=y
62ARCH_USE_MMU=y
63UCLIBC_HAS_FLOATS=y
64UCLIBC_HAS_FPU=y
65DO_C99_MATH=y
66KERNEL_HEADERS="/usr/include"
67HAVE_DOT_CONFIG=y
68
69UCLIBC_HAS_FENV=y
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/c7x0/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/c7x0/uClibc.machine
deleted file mode 100644
index ec0385bc0f..0000000000
--- a/meta/recipes-core/uclibc/uclibc-0.9.30.1/c7x0/uClibc.machine
+++ /dev/null
@@ -1,70 +0,0 @@
1#
2# Automatically generated make config: don't edit
3# Sun May 13 11:16:02 2007
4#
5# TARGET_alpha is not set
6TARGET_arm=y
7# TARGET_bfin is not set
8# TARGET_cris is not set
9# TARGET_e1 is not set
10# TARGET_frv is not set
11# TARGET_h8300 is not set
12# TARGET_hppa is not set
13# TARGET_i386 is not set
14# TARGET_i960 is not set
15# TARGET_ia64 is not set
16# TARGET_m68k is not set
17# TARGET_microblaze is not set
18# TARGET_mips is not set
19# TARGET_nios is not set
20# TARGET_nios2 is not set
21# TARGET_powerpc is not set
22# TARGET_sh is not set
23# TARGET_sh64 is not set
24# TARGET_sparc is not set
25# TARGET_v850 is not set
26# TARGET_vax is not set
27# TARGET_x86_64 is not set
28
29#
30# Target Architecture Features and Options
31#
32TARGET_ARCH="arm"
33FORCE_OPTIONS_FOR_ARCH=y
34# CONFIG_ARM_OABI is not set
35CONFIG_ARM_EABI=y
36USE_BX=y
37# CONFIG_GENERIC_ARM is not set
38# CONFIG_ARM610 is not set
39# CONFIG_ARM710 is not set
40# CONFIG_ARM7TDMI is not set
41# CONFIG_ARM720T is not set
42# CONFIG_ARM920T is not set
43# CONFIG_ARM922T is not set
44# CONFIG_ARM926T is not set
45# CONFIG_ARM10T is not set
46# CONFIG_ARM1136JF_S is not set
47# CONFIG_ARM1176JZ_S is not set
48# CONFIG_ARM1176JZF_S is not set
49# CONFIG_ARM_SA110 is not set
50# CONFIG_ARM_SA1100 is not set
51CONFIG_ARM_XSCALE=y
52# CONFIG_ARM_IWMMXT is not set
53TARGET_SUBARCH=""
54
55#
56# Using ELF file format
57#
58ARCH_ANY_ENDIAN=y
59ARCH_LITTLE_ENDIAN=y
60# ARCH_WANTS_BIG_ENDIAN is not set
61ARCH_WANTS_LITTLE_ENDIAN=y
62ARCH_HAS_MMU=y
63ARCH_USE_MMU=y
64UCLIBC_HAS_FLOATS=y
65# UCLIBC_HAS_FPU is not set
66UCLIBC_HAS_SOFT_FLOAT=y
67DO_C99_MATH=y
68KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include"
69HAVE_DOT_CONFIG=y
70
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/cm-x270/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/cm-x270/uClibc.machine
deleted file mode 100644
index e27931cf6b..0000000000
--- a/meta/recipes-core/uclibc/uclibc-0.9.30.1/cm-x270/uClibc.machine
+++ /dev/null
@@ -1,70 +0,0 @@
1#
2# Automatically generated make config: don't edit
3# Sat May 12 23:18:41 2007
4#
5# TARGET_alpha is not set
6TARGET_arm=y
7# TARGET_bfin is not set
8# TARGET_cris is not set
9# TARGET_e1 is not set
10# TARGET_frv is not set
11# TARGET_h8300 is not set
12# TARGET_hppa is not set
13# TARGET_i386 is not set
14# TARGET_i960 is not set
15# TARGET_ia64 is not set
16# TARGET_m68k is not set
17# TARGET_microblaze is not set
18# TARGET_mips is not set
19# TARGET_nios is not set
20# TARGET_nios2 is not set
21# TARGET_powerpc is not set
22# TARGET_sh is not set
23# TARGET_sh64 is not set
24# TARGET_sparc is not set
25# TARGET_v850 is not set
26# TARGET_vax is not set
27# TARGET_x86_64 is not set
28
29#
30# Target Architecture Features and Options
31#
32TARGET_ARCH="arm"
33FORCE_OPTIONS_FOR_ARCH=y
34# CONFIG_ARM_OABI is not set
35CONFIG_ARM_EABI=y
36USE_BX=y
37# CONFIG_GENERIC_ARM is not set
38# CONFIG_ARM610 is not set
39# CONFIG_ARM710 is not set
40# CONFIG_ARM7TDMI is not set
41# CONFIG_ARM720T is not set
42# CONFIG_ARM920T is not set
43# CONFIG_ARM922T is not set
44# CONFIG_ARM926T is not set
45# CONFIG_ARM10T is not set
46# CONFIG_ARM1136JF_S is not set
47# CONFIG_ARM1176JZ_S is not set
48# CONFIG_ARM1176JZF_S is not set
49# CONFIG_ARM_SA110 is not set
50# CONFIG_ARM_SA1100 is not set
51# CONFIG_ARM_XSCALE is not set
52CONFIG_ARM_IWMMXT=y
53TARGET_SUBARCH=""
54
55#
56# Using ELF file format
57#
58ARCH_ANY_ENDIAN=y
59ARCH_LITTLE_ENDIAN=y
60# ARCH_WANTS_BIG_ENDIAN is not set
61ARCH_WANTS_LITTLE_ENDIAN=y
62ARCH_HAS_MMU=y
63ARCH_USE_MMU=y
64UCLIBC_HAS_FLOATS=y
65# UCLIBC_HAS_FPU is not set
66UCLIBC_HAS_SOFT_FLOAT=y
67DO_C99_MATH=y
68KERNEL_HEADERS="/usr/include"
69HAVE_DOT_CONFIG=y
70
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/om-gta01/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/om-gta01/uClibc.machine
deleted file mode 100644
index 898b73a33b..0000000000
--- a/meta/recipes-core/uclibc/uclibc-0.9.30.1/om-gta01/uClibc.machine
+++ /dev/null
@@ -1,69 +0,0 @@
1#
2# Automatically generated make config: don't edit
3# Mon May 14 10:23:14 2007
4#
5# TARGET_alpha is not set
6TARGET_arm=y
7# TARGET_bfin is not set
8# TARGET_cris is not set
9# TARGET_e1 is not set
10# TARGET_frv is not set
11# TARGET_h8300 is not set
12# TARGET_hppa is not set
13# TARGET_i386 is not set
14# TARGET_i960 is not set
15# TARGET_ia64 is not set
16# TARGET_m68k is not set
17# TARGET_microblaze is not set
18# TARGET_mips is not set
19# TARGET_nios is not set
20# TARGET_nios2 is not set
21# TARGET_powerpc is not set
22# TARGET_sh is not set
23# TARGET_sh64 is not set
24# TARGET_sparc is not set
25# TARGET_v850 is not set
26# TARGET_vax is not set
27# TARGET_x86_64 is not set
28
29#
30# Target Architecture Features and Options
31#
32TARGET_ARCH="arm"
33FORCE_OPTIONS_FOR_ARCH=y
34# CONFIG_ARM_OABI is not set
35CONFIG_ARM_EABI=y
36USE_BX=y
37# CONFIG_GENERIC_ARM is not set
38# CONFIG_ARM610 is not set
39# CONFIG_ARM710 is not set
40# CONFIG_ARM7TDMI is not set
41# CONFIG_ARM720T is not set
42CONFIG_ARM920T=y
43# CONFIG_ARM922T is not set
44# CONFIG_ARM926T is not set
45# CONFIG_ARM10T is not set
46# CONFIG_ARM1136JF_S is not set
47# CONFIG_ARM1176JZ_S is not set
48# CONFIG_ARM1176JZF_S is not set
49# CONFIG_ARM_SA110 is not set
50# CONFIG_ARM_SA1100 is not set
51# CONFIG_ARM_XSCALE is not set
52# CONFIG_ARM_IWMMXT is not set
53TARGET_SUBARCH=""
54
55#
56# Using ELF file format
57#
58ARCH_ANY_ENDIAN=y
59ARCH_LITTLE_ENDIAN=y
60# ARCH_WANTS_BIG_ENDIAN is not set
61ARCH_WANTS_LITTLE_ENDIAN=y
62ARCH_HAS_MMU=y
63ARCH_USE_MMU=y
64UCLIBC_HAS_FLOATS=y
65# UCLIBC_HAS_FPU is not set
66UCLIBC_HAS_SOFT_FLOAT=y
67KERNEL_HEADERS="/usr/include"
68HAVE_DOT_CONFIG=y
69
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/spitz/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/spitz/uClibc.machine
deleted file mode 100644
index e27931cf6b..0000000000
--- a/meta/recipes-core/uclibc/uclibc-0.9.30.1/spitz/uClibc.machine
+++ /dev/null
@@ -1,70 +0,0 @@
1#
2# Automatically generated make config: don't edit
3# Sat May 12 23:18:41 2007
4#
5# TARGET_alpha is not set
6TARGET_arm=y
7# TARGET_bfin is not set
8# TARGET_cris is not set
9# TARGET_e1 is not set
10# TARGET_frv is not set
11# TARGET_h8300 is not set
12# TARGET_hppa is not set
13# TARGET_i386 is not set
14# TARGET_i960 is not set
15# TARGET_ia64 is not set
16# TARGET_m68k is not set
17# TARGET_microblaze is not set
18# TARGET_mips is not set
19# TARGET_nios is not set
20# TARGET_nios2 is not set
21# TARGET_powerpc is not set
22# TARGET_sh is not set
23# TARGET_sh64 is not set
24# TARGET_sparc is not set
25# TARGET_v850 is not set
26# TARGET_vax is not set
27# TARGET_x86_64 is not set
28
29#
30# Target Architecture Features and Options
31#
32TARGET_ARCH="arm"
33FORCE_OPTIONS_FOR_ARCH=y
34# CONFIG_ARM_OABI is not set
35CONFIG_ARM_EABI=y
36USE_BX=y
37# CONFIG_GENERIC_ARM is not set
38# CONFIG_ARM610 is not set
39# CONFIG_ARM710 is not set
40# CONFIG_ARM7TDMI is not set
41# CONFIG_ARM720T is not set
42# CONFIG_ARM920T is not set
43# CONFIG_ARM922T is not set
44# CONFIG_ARM926T is not set
45# CONFIG_ARM10T is not set
46# CONFIG_ARM1136JF_S is not set
47# CONFIG_ARM1176JZ_S is not set
48# CONFIG_ARM1176JZF_S is not set
49# CONFIG_ARM_SA110 is not set
50# CONFIG_ARM_SA1100 is not set
51# CONFIG_ARM_XSCALE is not set
52CONFIG_ARM_IWMMXT=y
53TARGET_SUBARCH=""
54
55#
56# Using ELF file format
57#
58ARCH_ANY_ENDIAN=y
59ARCH_LITTLE_ENDIAN=y
60# ARCH_WANTS_BIG_ENDIAN is not set
61ARCH_WANTS_LITTLE_ENDIAN=y
62ARCH_HAS_MMU=y
63ARCH_USE_MMU=y
64UCLIBC_HAS_FLOATS=y
65# UCLIBC_HAS_FPU is not set
66UCLIBC_HAS_SOFT_FLOAT=y
67DO_C99_MATH=y
68KERNEL_HEADERS="/usr/include"
69HAVE_DOT_CONFIG=y
70
diff --git a/meta/recipes-core/udev/files/50-hostap_cs.rules b/meta/recipes-core/udev/files/50-hostap_cs.rules
deleted file mode 100644
index efefdc58fc..0000000000
--- a/meta/recipes-core/udev/files/50-hostap_cs.rules
+++ /dev/null
@@ -1,4 +0,0 @@
1# hostap_cs needs ignore_cis_vcc=1 set - this should handle all cards
2#
3ACTION=="add", DEVICE=="hostap_cs", \
4 SYSFS{func_id}=="0x06", RUN+="/sbin/modprobe hostap_cs ignore_cis_vcc=1"
diff --git a/meta/recipes-core/udev/files/akita/mount.blacklist b/meta/recipes-core/udev/files/akita/mount.blacklist
deleted file mode 100644
index c15b582298..0000000000
--- a/meta/recipes-core/udev/files/akita/mount.blacklist
+++ /dev/null
@@ -1,3 +0,0 @@
1/dev/mtdblock
2/dev/loop
3/dev/ram
diff --git a/meta/recipes-core/udev/files/c7x0/mount.blacklist b/meta/recipes-core/udev/files/c7x0/mount.blacklist
deleted file mode 100644
index c15b582298..0000000000
--- a/meta/recipes-core/udev/files/c7x0/mount.blacklist
+++ /dev/null
@@ -1,3 +0,0 @@
1/dev/mtdblock
2/dev/loop
3/dev/ram
diff --git a/meta/recipes-core/udev/files/spitz/mount.blacklist b/meta/recipes-core/udev/files/spitz/mount.blacklist
deleted file mode 100644
index aee308f9b8..0000000000
--- a/meta/recipes-core/udev/files/spitz/mount.blacklist
+++ /dev/null
@@ -1,4 +0,0 @@
1/dev/mtdblock
2/dev/hda
3/dev/loop
4/dev/ram
diff --git a/meta/recipes-core/udev/files/tosa/mount.blacklist b/meta/recipes-core/udev/files/tosa/mount.blacklist
deleted file mode 100644
index c15b582298..0000000000
--- a/meta/recipes-core/udev/files/tosa/mount.blacklist
+++ /dev/null
@@ -1,3 +0,0 @@
1/dev/mtdblock
2/dev/loop
3/dev/ram
diff --git a/meta/recipes-core/udev/udev-new.inc b/meta/recipes-core/udev/udev-new.inc
index 4faaae1b8d..d1abf39074 100644
--- a/meta/recipes-core/udev/udev-new.inc
+++ b/meta/recipes-core/udev/udev-new.inc
@@ -27,8 +27,6 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
27 file://udev-cache \ 27 file://udev-cache \
28 file://init" 28 file://init"
29 29
30SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
31
32inherit autotools pkgconfig update-rc.d 30inherit autotools pkgconfig update-rc.d
33 31
34# udevd/udevadm -> /sbin/, libudev.so.* -> /lib/ 32# udevd/udevadm -> /sbin/, libudev.so.* -> /lib/
@@ -39,7 +37,6 @@ EXTRA_OECONF = "--disable-introspection --with-rootlibdir=${base_libdir} \
39 37
40PACKAGES =+ "udev-cache libudev libudev-dev libudev-dbg" 38PACKAGES =+ "udev-cache libudev libudev-dev libudev-dbg"
41PACKAGES =+ "libgudev libgudev-dev libgudev-dbg" 39PACKAGES =+ "libgudev libgudev-dev libgudev-dbg"
42PACKAGE_ARCH_h2200 = "h2200"
43 40
44INITSCRIPT_PACKAGES = "udev udev-cache" 41INITSCRIPT_PACKAGES = "udev udev-cache"
45INITSCRIPT_NAME_udev = "udev" 42INITSCRIPT_NAME_udev = "udev"
@@ -86,7 +83,3 @@ do_install_append () {
86 install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh 83 install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh
87 install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts 84 install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts
88} 85}
89
90do_install_append_h2200() {
91 install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules
92}
diff --git a/meta/recipes-core/udev/udev_145.bb b/meta/recipes-core/udev/udev_145.bb
index fde5050b5b..becef04706 100644
--- a/meta/recipes-core/udev/udev_145.bb
+++ b/meta/recipes-core/udev/udev_145.bb
@@ -1,15 +1,12 @@
1RPROVIDES_${PN} = "hotplug" 1RPROVIDES_${PN} = "hotplug"
2 2
3PR = "r10" 3PR = "r11"
4 4
5SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ 5SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
6 file://enable-gudev.patch;patch=1 \ 6 file://enable-gudev.patch;patch=1 \
7 file://run.rules \ 7 file://run.rules \
8 " 8 "
9 9
10SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
11PACKAGE_ARCH_h2200 = "h2200"
12
13require udev.inc 10require udev.inc
14 11
15INITSCRIPT_PARAMS = "start 03 S ." 12INITSCRIPT_PARAMS = "start 03 S ."
@@ -56,7 +53,3 @@ do_install () {
56 install -d ${D}${base_libdir}/udev/ 53 install -d ${D}${base_libdir}/udev/
57} 54}
58 55
59do_install_append_h2200() {
60 install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules
61}
62
diff --git a/meta/recipes-core/udev/udev_164.bb b/meta/recipes-core/udev/udev_164.bb
index 135685f2b8..76fd907ef7 100644
--- a/meta/recipes-core/udev/udev_164.bb
+++ b/meta/recipes-core/udev/udev_164.bb
@@ -1,6 +1,6 @@
1include udev-new.inc 1include udev-new.inc
2 2
3PR = "r1" 3PR = "r2"
4 4
5SRC_URI[md5sum] = "fddac2d54761ea34865af9467377ca9f" 5SRC_URI[md5sum] = "fddac2d54761ea34865af9467377ca9f"
6SRC_URI[sha256sum] = "c12e66280b5e1465f6587a8cfa47d7405c4caa7e52ce5dd13478d04f6ec05e5c" 6SRC_URI[sha256sum] = "c12e66280b5e1465f6587a8cfa47d7405c4caa7e52ce5dd13478d04f6ec05e5c"
diff --git a/meta/recipes-gnome/tasks/task-sdk-gmae.inc b/meta/recipes-gnome/tasks/task-sdk-gmae.inc
index 2071089f24..586d76fd73 100644
--- a/meta/recipes-gnome/tasks/task-sdk-gmae.inc
+++ b/meta/recipes-gnome/tasks/task-sdk-gmae.inc
@@ -36,5 +36,3 @@ SDK-EXTRAS_qemux86 ?= " valgrind lttng-ust-dev"
36SDK-EXTRAS_qemux86-64 ?= " lttng-ust-dev" 36SDK-EXTRAS_qemux86-64 ?= " lttng-ust-dev"
37SDK-EXTRAS_qemuppc ?= " lttng-ust-dev" 37SDK-EXTRAS_qemuppc ?= " lttng-ust-dev"
38SDK-EXTRAS_qemuarm ?= " lttng-ust-dev" 38SDK-EXTRAS_qemuarm ?= " lttng-ust-dev"
39SDK-EXTRAS_emenlow ?= " lttng-ust-dev"
40SDK-EXTRAS_atom-pc ?= " lttng-ust-dev"
diff --git a/meta/recipes-graphics/clutter/clutter-1.4_1.4.2.bb b/meta/recipes-graphics/clutter/clutter-1.4_1.4.2.bb
index 998545ab21..b736846034 100644
--- a/meta/recipes-graphics/clutter/clutter-1.4_1.4.2.bb
+++ b/meta/recipes-graphics/clutter/clutter-1.4_1.4.2.bb
@@ -1,6 +1,6 @@
1require clutter.inc 1require clutter.inc
2 2
3PR = "r0" 3PR = "r1"
4 4
5PACKAGES =+ "${PN}-examples" 5PACKAGES =+ "${PN}-examples"
6FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png" 6FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png"
diff --git a/meta/recipes-graphics/clutter/clutter-1.6_1.6.14.bb b/meta/recipes-graphics/clutter/clutter-1.6_1.6.14.bb
index ab9e0e0560..938a30ceb1 100644
--- a/meta/recipes-graphics/clutter/clutter-1.6_1.6.14.bb
+++ b/meta/recipes-graphics/clutter/clutter-1.6_1.6.14.bb
@@ -1,6 +1,6 @@
1require recipes-graphics/clutter/clutter.inc 1require recipes-graphics/clutter/clutter.inc
2 2
3PR = "r0" 3PR = "r1"
4 4
5# Internal json-glib was removed in Clutter 1.5.2 5# Internal json-glib was removed in Clutter 1.5.2
6STDDEPENDS += "json-glib" 6STDDEPENDS += "json-glib"
diff --git a/meta/recipes-graphics/clutter/clutter.inc b/meta/recipes-graphics/clutter/clutter.inc
index 2f9a55cab5..54f65c5357 100644
--- a/meta/recipes-graphics/clutter/clutter.inc
+++ b/meta/recipes-graphics/clutter/clutter.inc
@@ -2,47 +2,12 @@ DESCRIPTION = "Clutter graphics library"
2HOMEPAGE = "http://www.clutter-project.org/" 2HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "LGPL" 3LICENSE = "LGPL"
4 4
5COMPATIBLE_MACHINE = "(zylonite|mx31litekit|omap-3430ldp|omap-3430sdp|mx31ads|qemuarm|qemux86|ipodtouch|atom-pc|menlow)"
6
7STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gtk+ libxi" 5STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gtk+ libxi"
8BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}" 6BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}"
9 7
10DEPENDS = "${STDDEPENDS} virtual/libgl" 8DEPENDS = "${STDDEPENDS} virtual/libgl"
11EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx" 9EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx"
12 10
13DEPENDS_zylonite = "${STDDEPENDS} libgles-zylonite tslib"
14EXTRA_OECONF_zylonite = "${BASE_CONF} --with-flavour=eglnative"
15PACKAGE_ARCH_zylonite = "${MACHINE_ARCH}"
16LDFLAGS_append_zylonite = " -lnws -lstdc++ "
17
18DEPENDS_mx31litekit = "${STDDEPENDS} libgles-mx31 tslib"
19EXTRA_OECONF_mx31litekit = "${BASE_CONF} --with-flavour=eglnative"
20PACKAGE_ARCH_mx31litekit = "${MACHINE_ARCH}"
21LDFLAGS_append_mx31litekit = " -lpvrNULLWSEGL -lstdc++ "
22
23DEPENDS_omap-3430ldp = "${STDDEPENDS} libgles-omap3 tslib"
24# The eglx drivers are pretty dire, use eglnative
25EXTRA_OECONF_omap-3430ldp = "${BASE_CONF} --with-flavour=eglnative"
26PACKAGE_ARCH_omap-3430ldp = "${MACHINE_ARCH}"
27
28DEPENDS_omap-3430sdp = "${STDDEPENDS} libgles-omap3 tslib"
29# The eglx drivers are pretty dire, use eglnative
30EXTRA_OECONF_omap-3430sdp = "${BASE_CONF} --with-flavour=eglnative"
31PACKAGE_ARCH_omap-3430sdp = "${MACHINE_ARCH}"
32
33DEPENDS_mx31ads = "${STDDEPENDS} libgles-mx31 tslib"
34EXTRA_OECONF_mx31ads = "${BASE_CONF} --with-flavour=eglnative"
35PACKAGE_ARCH_mx31ads = "${MACHINE_ARCH}"
36LDFLAGS_append_mx31ads = " -lpvrNULLWSEGL -lstdc++ "
37
38DEPENDS_atom-pc = "${STDDEPENDS} virtual/xserver-xf86 virtual/libgl"
39EXTRA_OECONF_atom-pc = "${BASE_CONF} --with-flavour=glx"
40PACKAGE_ARCH_atom-pc = "${MACHINE_ARCH}"
41
42DEPENDS_menlow = "${STDDEPENDS} virtual/xserver-xf86 virtual/libgl"
43EXTRA_OECONF_menlow = "${BASE_CONF} --with-flavour=glx"
44PACKAGE_ARCH_menlow = "${MACHINE_ARCH}"
45
46FILESPATH = "${FILE_DIRNAME}/clutter" 11FILESPATH = "${FILE_DIRNAME}/clutter"
47 12
48inherit autotools pkgconfig gtk-doc gettext 13inherit autotools pkgconfig gtk-doc gettext
diff --git a/meta/recipes-graphics/clutter/clutter_git.bb b/meta/recipes-graphics/clutter/clutter_git.bb
index 6df48e2e69..cb5f47639b 100644
--- a/meta/recipes-graphics/clutter/clutter_git.bb
+++ b/meta/recipes-graphics/clutter/clutter_git.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
5 5
6SRCREV = "e957e277b8a4893ce8c99e94402036d42a8b3748" 6SRCREV = "e957e277b8a4893ce8c99e94402036d42a8b3748"
7PV = "1.0.0+git${SRCPV}" 7PV = "1.0.0+git${SRCPV}"
8PR = "r8" 8PR = "r9"
9 9
10SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=master \ 10SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=master \
11 file://enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch;patch=1;rev=654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673 \ 11 file://enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch;patch=1;rev=654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673 \
diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb b/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb
index 28f9f27214..c7bd974152 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb
@@ -19,9 +19,6 @@ SRC_URI[sha256sum] = "8ced2678ce11cf30804694a92ea3ca6b82f158ae8995bdc626c7e85aac
19# most of our targets do not have DRI so will use mesa-xlib 19# most of our targets do not have DRI so will use mesa-xlib
20DEFAULT_PREFERENCE = "-1" 20DEFAULT_PREFERENCE = "-1"
21 21
22# Atom PCs have DRI support so use mesa-dri by default
23DEFAULT_PREFERENCE_atom-pc = "1"
24
25LEAD_SONAME = "libGL.so.1" 22LEAD_SONAME = "libGL.so.1"
26 23
27EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium" 24EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium"
diff --git a/meta/recipes-graphics/mesa/mesa-dri_git.bb b/meta/recipes-graphics/mesa/mesa-dri_git.bb
index f61d23c543..07887f4c10 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_git.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_git.bb
@@ -18,9 +18,6 @@ PR = "r1"
18# most of our targets do not have DRI so will use mesa-xlib 18# most of our targets do not have DRI so will use mesa-xlib
19DEFAULT_PREFERENCE = "-1" 19DEFAULT_PREFERENCE = "-1"
20 20
21# Atom PCs have DRI support so use mesa-dri by default
22DEFAULT_PREFERENCE_atom-pc = "1"
23
24PACKAGES =+ "${PN}-xprogs" 21PACKAGES =+ "${PN}-xprogs"
25PACKAGES_DYNAMIC = "mesa-dri-driver-*" 22PACKAGES_DYNAMIC = "mesa-dri-driver-*"
26 23
diff --git a/meta/recipes-graphics/mutter/mutter.inc b/meta/recipes-graphics/mutter/mutter.inc
index a734cdda46..60ceed4a96 100644
--- a/meta/recipes-graphics/mutter/mutter.inc
+++ b/meta/recipes-graphics/mutter/mutter.inc
@@ -10,9 +10,6 @@ ALTERNATIVE_LINK = "${bindir}/x-window-manager"
10ALTERNATIVE_PATH = "${bindir}/mutter" 10ALTERNATIVE_PATH = "${bindir}/mutter"
11ALTERNATIVE_PRIORITY = "11" 11ALTERNATIVE_PRIORITY = "11"
12 12
13COMPATIBLE_MACHINE = "(zylonite|mx31litekit|omap-3430ldp|omap-3430sdp|mx31ads|qemuarm|qemux86|ipodtouch|atom-pc|menlow)"
14
15
16EXTRA_OECONF += "--disable-verbose \ 13EXTRA_OECONF += "--disable-verbose \
17 --disable-xinerama \ 14 --disable-xinerama \
18 --without-introspection \ 15 --without-introspection \
diff --git a/meta/recipes-graphics/tslib/tslib/a780/tslib.sh b/meta/recipes-graphics/tslib/tslib/a780/tslib.sh
deleted file mode 100644
index 51cd0f1f36..0000000000
--- a/meta/recipes-graphics/tslib/tslib/a780/tslib.sh
+++ /dev/null
@@ -1,6 +0,0 @@
1#!/bin/sh
2
3TSLIB_TSDEVICE=/dev/input/event1
4TSLIB_CONFFILE=/etc/ts.conf
5
6export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/meta/recipes-graphics/tslib/tslib/collie/ts.conf b/meta/recipes-graphics/tslib/tslib/collie/ts.conf
deleted file mode 100644
index 2099b9b414..0000000000
--- a/meta/recipes-graphics/tslib/tslib/collie/ts.conf
+++ /dev/null
@@ -1,5 +0,0 @@
1module_raw collie
2module pthres pmin=1
3module variance delta=30
4module dejitter delta=100
5module linear
diff --git a/meta/recipes-graphics/tslib/tslib/collie/tslib.sh b/meta/recipes-graphics/tslib/tslib/collie/tslib.sh
deleted file mode 100644
index 664bda426a..0000000000
--- a/meta/recipes-graphics/tslib/tslib/collie/tslib.sh
+++ /dev/null
@@ -1,13 +0,0 @@
1#!/bin/sh
2
3TSLIB_TSDEVICE=/dev/input/touchscreen0
4TSLIB_CONFFILE=/etc/ts.conf
5
6case `uname -r` in
72.4*)
8 TSLIB_TSDEVICE=/dev/ts
9 TSLIB_CONFFILE=/usr/share/tslib/ts.conf-collie-2.4
10 ;;
11esac
12
13export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/meta/recipes-graphics/tslib/tslib/devfs.patch b/meta/recipes-graphics/tslib/tslib/devfs.patch
deleted file mode 100644
index d7ef0a9589..0000000000
--- a/meta/recipes-graphics/tslib/tslib/devfs.patch
+++ /dev/null
@@ -1,18 +0,0 @@
1
2#
3# Patch managed by http://www.holgerschurig.de/patcher.html
4#
5
6--- tslib/tests/fbutils.c~devfs.patch
7+++ tslib/tests/fbutils.c
8@@ -44,8 +44,8 @@
9 static unsigned colormap [256];
10 int xres, yres;
11
12-static char *defaultfbdevice = "/dev/fb0";
13-static char *defaultconsoledevice = "/dev/tty";
14+static char *defaultfbdevice = "/dev/fb/0";
15+static char *defaultconsoledevice = "/dev/vc/";
16 static char *fbdevice = NULL;
17 static char *consoledevice = NULL;
18
diff --git a/meta/recipes-graphics/tslib/tslib/e680/tslib.sh b/meta/recipes-graphics/tslib/tslib/e680/tslib.sh
deleted file mode 100644
index 51cd0f1f36..0000000000
--- a/meta/recipes-graphics/tslib/tslib/e680/tslib.sh
+++ /dev/null
@@ -1,6 +0,0 @@
1#!/bin/sh
2
3TSLIB_TSDEVICE=/dev/input/event1
4TSLIB_CONFFILE=/etc/ts.conf
5
6export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/meta/recipes-graphics/tslib/tslib/event1.patch b/meta/recipes-graphics/tslib/tslib/event1.patch
deleted file mode 100644
index 88cc3f3a2a..0000000000
--- a/meta/recipes-graphics/tslib/tslib/event1.patch
+++ /dev/null
@@ -1,80 +0,0 @@
1
2#
3# Patch managed by http://www.holgerschurig.de/patcher.html
4#
5
6--- tslib/tests/ts_calibrate.c~event1
7+++ tslib/tests/ts_calibrate.c
8@@ -179,11 +179,7 @@
9 if( (tsdevice = getenv("TSLIB_TSDEVICE")) != NULL ) {
10 ts = ts_open(tsdevice,0);
11 } else {
12-#ifdef USE_INPUT_API
13- ts = ts_open("/dev/input/event0", 0);
14-#else
15- ts = ts_open("/dev/touchscreen/ucb1x00", 0);
16-#endif /* USE_INPUT_API */
17+ ts = ts_open("/dev/input/event1", 0);
18 }
19
20 if (!ts) {
21--- tslib/tests/ts_print.c~event1
22+++ tslib/tests/ts_print.c
23@@ -28,11 +28,7 @@
24 if( (tsdevice = getenv("TSLIB_TSDEVICE")) != NULL ) {
25 ts = ts_open(tsdevice,0);
26 } else {
27-#ifdef USE_INPUT_API
28- ts = ts_open("/dev/input/event0", 0);
29-#else
30- ts = ts_open("/dev/touchscreen/ucb1x00", 0);
31-#endif /* USE_INPUT_API */
32+ ts = ts_open("/dev/input/event1", 0);
33 }
34
35 if (!ts) {
36--- tslib/tests/ts_test.c~event1
37+++ tslib/tests/ts_test.c
38@@ -120,11 +120,7 @@
39 signal(SIGTERM, sig);
40
41 if ((tsdevice = getenv("TSLIB_TSDEVICE")) == NULL) {
42-#ifdef USE_INPUT_API
43- tsdevice = strdup ("/dev/input/event0");
44-#else
45- tsdevice = strdup ("/dev/touchscreen/ucb1x00");
46-#endif /* USE_INPUT_API */
47+ tsdevice = strdup ("/dev/input/event1");
48 }
49
50 ts = ts_open (tsdevice, 0);
51--- tslib/tests/ts_print_raw.c~event1
52+++ tslib/tests/ts_print_raw.c
53@@ -28,11 +28,7 @@
54 if( (tsdevice = getenv("TSLIB_TSDEVICE")) != NULL ) {
55 ts = ts_open(tsdevice,0);
56 } else {
57-#ifdef USE_INPUT_API
58- ts = ts_open("/dev/input/event0", 0);
59-#else
60- ts = ts_open("/dev/touchscreen/ucb1x00", 0);
61-#endif /* USE_INPUT_API */
62+ ts = ts_open("/dev/input/event1", 0);
63 }
64
65 if (!ts) {
66--- tslib/tests/ts_harvest.c~event1
67+++ tslib/tests/ts_harvest.c
68@@ -75,11 +75,7 @@
69 signal(SIGTERM, sig);
70
71 if ((tsdevice = getenv("TSLIB_TSDEVICE")) == NULL) {
72-#ifdef USE_INPUT_API
73- tsdevice = strdup ("/dev/input/event0");
74-#else
75- tsdevice = strdup ("/dev/touchscreen/ucb1x00");
76-#endif /* USE_INPUT_API */
77+ tsdevice = strdup ("/dev/input/event1");
78 }
79
80 ts = ts_open (tsdevice, 0);
diff --git a/meta/recipes-graphics/tslib/tslib/jornada56x/ts.conf b/meta/recipes-graphics/tslib/tslib/jornada56x/ts.conf
deleted file mode 100644
index 20729b6154..0000000000
--- a/meta/recipes-graphics/tslib/tslib/jornada56x/ts.conf
+++ /dev/null
@@ -1,5 +0,0 @@
1module_raw h3600
2module pthres pmin=1
3module variance delta=30
4module dejitter delta=100
5module linear
diff --git a/meta/recipes-graphics/tslib/tslib/jornada56x/tslib.sh b/meta/recipes-graphics/tslib/tslib/jornada56x/tslib.sh
deleted file mode 100644
index 8f907b0755..0000000000
--- a/meta/recipes-graphics/tslib/tslib/jornada56x/tslib.sh
+++ /dev/null
@@ -1,5 +0,0 @@
1#!/bin/sh
2
3TSLIB_TSDEVICE=/dev/input/tsraw0
4
5export TSLIB_TSDEVICE
diff --git a/meta/recipes-graphics/tslib/tslib/jornada6xx/ts.conf b/meta/recipes-graphics/tslib/tslib/jornada6xx/ts.conf
deleted file mode 100644
index 20729b6154..0000000000
--- a/meta/recipes-graphics/tslib/tslib/jornada6xx/ts.conf
+++ /dev/null
@@ -1,5 +0,0 @@
1module_raw h3600
2module pthres pmin=1
3module variance delta=30
4module dejitter delta=100
5module linear
diff --git a/meta/recipes-graphics/tslib/tslib/jornada6xx/tslib.sh b/meta/recipes-graphics/tslib/tslib/jornada6xx/tslib.sh
deleted file mode 100644
index 1b5db781c1..0000000000
--- a/meta/recipes-graphics/tslib/tslib/jornada6xx/tslib.sh
+++ /dev/null
@@ -1,5 +0,0 @@
1#!/bin/sh
2
3TSLIB_TSDEVICE=/dev/input/ts0
4
5export TSLIB_TSDEVICE
diff --git a/meta/recipes-graphics/tslib/tslib/jornada7xx/ts.conf b/meta/recipes-graphics/tslib/tslib/jornada7xx/ts.conf
deleted file mode 100644
index 09309719f2..0000000000
--- a/meta/recipes-graphics/tslib/tslib/jornada7xx/ts.conf
+++ /dev/null
@@ -1,5 +0,0 @@
1module_raw input
2module pthres pmin=1
3module variance delta=30
4module dejitter delta=100
5module linear
diff --git a/meta/recipes-graphics/tslib/tslib/jornada7xx/tslib.sh b/meta/recipes-graphics/tslib/tslib/jornada7xx/tslib.sh
deleted file mode 100644
index 040f4de3d5..0000000000
--- a/meta/recipes-graphics/tslib/tslib/jornada7xx/tslib.sh
+++ /dev/null
@@ -1,5 +0,0 @@
1#!/bin/sh
2
3TSLIB_TSDEVICE=/dev/input/event1
4
5export TSLIB_TSDEVICE
diff --git a/meta/recipes-graphics/tslib/tslib/mnci/ts.conf b/meta/recipes-graphics/tslib/tslib/mnci/ts.conf
deleted file mode 100644
index adff17717b..0000000000
--- a/meta/recipes-graphics/tslib/tslib/mnci/ts.conf
+++ /dev/null
@@ -1,5 +0,0 @@
1module_raw input
2module pthres pmin=600
3module variance delta=30
4module dejitter delta=100
5module linear
diff --git a/meta/recipes-graphics/tslib/tslib/mnci/tslib.sh b/meta/recipes-graphics/tslib/tslib/mnci/tslib.sh
deleted file mode 100644
index 07928f226d..0000000000
--- a/meta/recipes-graphics/tslib/tslib/mnci/tslib.sh
+++ /dev/null
@@ -1 +0,0 @@
1export TSLIB_TSDEVICE=/dev/input/event1
diff --git a/meta/recipes-graphics/tslib/tslib/netbook-pro/ts.conf b/meta/recipes-graphics/tslib/tslib/netbook-pro/ts.conf
deleted file mode 100644
index 6d94a8f468..0000000000
--- a/meta/recipes-graphics/tslib/tslib/netbook-pro/ts.conf
+++ /dev/null
@@ -1,5 +0,0 @@
1module_raw input
2module variance delta=80
3#module dejitter delta=2
4module linear
5
diff --git a/meta/recipes-graphics/tslib/tslib/netbook-pro/tslib.sh b/meta/recipes-graphics/tslib/tslib/netbook-pro/tslib.sh
deleted file mode 100644
index d31bc76368..0000000000
--- a/meta/recipes-graphics/tslib/tslib/netbook-pro/tslib.sh
+++ /dev/null
@@ -1,5 +0,0 @@
1#!/bin/sh
2
3TSLIB_TSDEVICE=`detect-stylus --device`
4
5export TSLIB_TSDEVICE
diff --git a/meta/recipes-graphics/tslib/tslib/omap1610h2/tslib.sh b/meta/recipes-graphics/tslib/tslib/omap1610h2/tslib.sh
deleted file mode 100644
index 040f4de3d5..0000000000
--- a/meta/recipes-graphics/tslib/tslib/omap1610h2/tslib.sh
+++ /dev/null
@@ -1,5 +0,0 @@
1#!/bin/sh
2
3TSLIB_TSDEVICE=/dev/input/event1
4
5export TSLIB_TSDEVICE
diff --git a/meta/recipes-graphics/tslib/tslib/omap5912osk/tslib.sh b/meta/recipes-graphics/tslib/tslib/omap5912osk/tslib.sh
deleted file mode 100644
index 6bb56651f8..0000000000
--- a/meta/recipes-graphics/tslib/tslib/omap5912osk/tslib.sh
+++ /dev/null
@@ -1,4 +0,0 @@
1#!/bin/sh
2
3export TSLIB_TSDEVICE=/dev/input/event1
4export QWS_MOUSE_PROTO=TPanel
diff --git a/meta/recipes-graphics/tslib/tslib/simpad/tslib.sh b/meta/recipes-graphics/tslib/tslib/simpad/tslib.sh
deleted file mode 100644
index 9c4eb1e0f9..0000000000
--- a/meta/recipes-graphics/tslib/tslib/simpad/tslib.sh
+++ /dev/null
@@ -1,14 +0,0 @@
1#!/bin/sh
2
3TSLIB_TSDEVICE=/dev/input/touchscreen0
4TSLIB_CONFFILE=/etc/ts.conf
5
6case `uname -r` in
72.4*)
8 TSLIB_TSDEVICE=/dev/touchscreen/ucb1x00
9 TSLIB_CONFFILE=/usr/share/tslib/ts.conf-simpad-2.4
10 ;;
11esac
12
13export TSLIB_TSDEVICE TSLIB_CONFFILE
14
diff --git a/meta/recipes-graphics/tslib/tslib/ts.conf-collie-2.4 b/meta/recipes-graphics/tslib/tslib/ts.conf-collie-2.4
deleted file mode 100644
index 2099b9b414..0000000000
--- a/meta/recipes-graphics/tslib/tslib/ts.conf-collie-2.4
+++ /dev/null
@@ -1,5 +0,0 @@
1module_raw collie
2module pthres pmin=1
3module variance delta=30
4module dejitter delta=100
5module linear
diff --git a/meta/recipes-graphics/tslib/tslib/ts.conf-simpad-2.4 b/meta/recipes-graphics/tslib/tslib/ts.conf-simpad-2.4
deleted file mode 100644
index 035e794cb4..0000000000
--- a/meta/recipes-graphics/tslib/tslib/ts.conf-simpad-2.4
+++ /dev/null
@@ -1,5 +0,0 @@
1module_raw ucb1x00
2module pthres pmin=1
3module variance delta=10
4module dejitter delta=150
5module linear
diff --git a/meta/recipes-graphics/tslib/tslib_1.0.bb b/meta/recipes-graphics/tslib/tslib_1.0.bb
index 51529e3f13..9ab8259e47 100644
--- a/meta/recipes-graphics/tslib/tslib_1.0.bb
+++ b/meta/recipes-graphics/tslib/tslib_1.0.bb
@@ -10,19 +10,15 @@ SECTION = "base"
10LICENSE = "LGPLv2" 10LICENSE = "LGPLv2"
11LIC_FILES_CHKSUM = "file://COPYING;md5=f30a9716ef3762e3467a2f62bf790f0a" 11LIC_FILES_CHKSUM = "file://COPYING;md5=f30a9716ef3762e3467a2f62bf790f0a"
12 12
13PR = "r16" 13PR = "r17"
14 14
15SRC_URI = "http://download.berlios.de/tslib/tslib-${PV}.tar.bz2 \ 15SRC_URI = "http://download.berlios.de/tslib/tslib-${PV}.tar.bz2 \
16 file://fix_version.patch;patch=1 \ 16 file://fix_version.patch;patch=1 \
17 file://ts.conf \ 17 file://ts.conf \
18 file://ts.conf-simpad-2.4 \
19 file://ts.conf-collie-2.4 \
20 file://tslib.sh" 18 file://tslib.sh"
21 19
22SRC_URI[md5sum] = "92b2eb55b1e4ef7e2c0347069389390e" 20SRC_URI[md5sum] = "92b2eb55b1e4ef7e2c0347069389390e"
23SRC_URI[sha256sum] = "9c40d914e4f6fe00bdd77137d671c7ce4f211686228f2eb8b2d3c2360bc249c8" 21SRC_URI[sha256sum] = "9c40d914e4f6fe00bdd77137d671c7ce4f211686228f2eb8b2d3c2360bc249c8"
24SRC_URI_append_mnci += " file://devfs.patch;patch=1"
25SRC_URI_append_mnci += " file://event1.patch;patch=1"
26SRC_URI_append_qemumips += " file://32bitBE-support.patch;patch=1" 22SRC_URI_append_qemumips += " file://32bitBE-support.patch;patch=1"
27 23
28 24
@@ -37,18 +33,6 @@ do_install_prepend() {
37do_install_append() { 33do_install_append() {
38 install -d ${D}${sysconfdir}/profile.d/ 34 install -d ${D}${sysconfdir}/profile.d/
39 install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ 35 install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/
40 case ${MACHINE} in
41 collie )
42 install -d ${D}${datadir}/tslib
43 install -m 0644 ${WORKDIR}/ts.conf-collie-2.4 ${D}${datadir}/tslib/
44 ;;
45 simpad )
46 install -d ${D}${datadir}/tslib
47 install -m 0644 ${WORKDIR}/ts.conf-simpad-2.4 ${D}${datadir}/tslib/
48 ;;
49 *)
50 ;;
51 esac
52} 36}
53 37
54SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" 38SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
@@ -58,20 +42,6 @@ SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
58#RDEPENDS_tslib-conf_weird-machine = "detect-stylus" 42#RDEPENDS_tslib-conf_weird-machine = "detect-stylus"
59RPROVIDES_tslib-conf = "libts-0.0-conf" 43RPROVIDES_tslib-conf = "libts-0.0-conf"
60 44
61# Machines with machine specific patches
62PACKAGE_ARCH_mnci = "${MACHINE_ARCH}"
63# Machines with machine specific config files (tslib.sh)
64PACKAGE_ARCH_tslib-conf_a780 = "${MACHINE_ARCH}"
65PACKAGE_ARCH_tslib-conf_collie = "${MACHINE_ARCH}"
66PACKAGE_ARCH_tslib-conf_e680 = "${MACHINE_ARCH}"
67PACKAGE_ARCH_tslib-conf_jornada56x = "${MACHINE_ARCH}"
68PACKAGE_ARCH_tslib-conf_jornada6xx = "${MACHINE_ARCH}"
69PACKAGE_ARCH_tslib-conf_jornada7xx = "${MACHINE_ARCH}"
70PACKAGE_ARCH_tslib-conf_netbook-pro = "${MACHINE_ARCH}"
71PACKAGE_ARCH_tslib-conf_omap1610h2 = "${MACHINE_ARCH}"
72PACKAGE_ARCH_tslib-conf_omap5912osk = "${MACHINE_ARCH}"
73PACKAGE_ARCH_tslib-conf_simpad = "${MACHINE_ARCH}"
74
75PACKAGES =+ "tslib-conf tslib-tests tslib-calibrate" 45PACKAGES =+ "tslib-conf tslib-tests tslib-calibrate"
76DEBIAN_NOAUTONAME_tslib-conf = "1" 46DEBIAN_NOAUTONAME_tslib-conf = "1"
77DEBIAN_NOAUTONAME_tslib-tests = "1" 47DEBIAN_NOAUTONAME_tslib-tests = "1"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/atom-pc/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/atom-pc/xorg.conf
deleted file mode 100644
index e18b911199..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/atom-pc/xorg.conf
+++ /dev/null
@@ -1,26 +0,0 @@
1Section "Device"
2 Identifier "Intel Graphics Driver"
3 Driver "intel"
4EndSection
5
6Section "Monitor"
7 Identifier "Generic Monitor"
8 Option "DPMS"
9EndSection
10
11Section "Screen"
12 Identifier "Default Screen"
13 Device "Intel Graphics Driver"
14 Monitor "Generic Monitor"
15 DefaultDepth 24
16EndSection
17
18Section "ServerLayout"
19 Identifier "Default Layout"
20 Screen "Default Screen"
21EndSection
22
23Section "ServerFlags"
24 Option "DontZap" "0"
25 Option "AutoAddDevices" "False"
26EndSection
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/igep0020/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/igep0020/xorg.conf
deleted file mode 100644
index ae8a395a05..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/igep0020/xorg.conf
+++ /dev/null
@@ -1,47 +0,0 @@
1
2Section "Files"
3EndSection
4
5Section "InputDevice"
6 Identifier "Generic Keyboard"
7 Driver "kbd"
8 Option "CoreKeyboard"
9 Option "XkbRules" "xorg"
10 Option "XkbModel" "pc105"
11 Option "XkbLayout" "us"
12EndSection
13
14Section "InputDevice"
15 Identifier "Configured Mouse"
16 Driver "mouse"
17 Option "CorePointer"
18 Option "Device" "/dev/input/mice"
19 Option "Protocol" "ImPS/2"
20 Option "ZAxisMapping" "4 5"
21 Option "Emulate3Buttons" "true"
22EndSection
23
24Section "Device"
25 Identifier "OMAPFB Graphics Controller"
26 Driver "omapfb"
27EndSection
28
29Section "Monitor"
30 Identifier "Generic Monitor"
31 Option "DPMS"
32EndSection
33
34Section "Screen"
35 Identifier "Default Screen"
36 Device "OMAPFB Graphics Controller"
37 Monitor "Generic Monitor"
38EndSection
39
40Section "ServerLayout"
41 Identifier "Default Layout"
42 Screen "Default Screen"
43 InputDevice "Generic Keyboard"
44 InputDevice "Configured Mouse"
45 Option "AllowEmptyInput" "no"
46EndSection
47
diff --git a/meta/recipes-kernel/modutils/files/ipaq-pxa-2.6/modules b/meta/recipes-kernel/modutils/files/ipaq-pxa-2.6/modules
deleted file mode 100644
index ca99e71df0..0000000000
--- a/meta/recipes-kernel/modutils/files/ipaq-pxa-2.6/modules
+++ /dev/null
@@ -1,18 +0,0 @@
1mq11xx_base
2soc-device
3h2200_lcd
4h4000_lcd
5cfbcopyarea
6cfbfillrect
7cfbimgblt
8mq1100fb
9pxafb
10lcd
11backlight
12font
13fbcon
14pxa2xx_udc
15g_ether
16sunrpc
17lockd
18nfs
diff --git a/meta/recipes-kernel/modutils/files/ipaq-pxa-2.6/modules.conf b/meta/recipes-kernel/modutils/files/ipaq-pxa-2.6/modules.conf
deleted file mode 100644
index ef2e561e89..0000000000
--- a/meta/recipes-kernel/modutils/files/ipaq-pxa-2.6/modules.conf
+++ /dev/null
@@ -1 +0,0 @@
1# Add ipaq-pxa-2.6 modules parameters and aliases here
diff --git a/meta/recipes-kernel/modutils/files/mnci/modules b/meta/recipes-kernel/modutils/files/mnci/modules
deleted file mode 100644
index e228d2e8a8..0000000000
--- a/meta/recipes-kernel/modutils/files/mnci/modules
+++ /dev/null
@@ -1 +0,0 @@
1sysctl
diff --git a/meta/recipes-kernel/modutils/files/mnci/modules-ramses b/meta/recipes-kernel/modutils/files/mnci/modules-ramses
deleted file mode 100644
index e228d2e8a8..0000000000
--- a/meta/recipes-kernel/modutils/files/mnci/modules-ramses
+++ /dev/null
@@ -1 +0,0 @@
1sysctl
diff --git a/meta/recipes-kernel/modutils/files/mnci/modules.conf b/meta/recipes-kernel/modutils/files/mnci/modules.conf
deleted file mode 100644
index 310e5bb6c8..0000000000
--- a/meta/recipes-kernel/modutils/files/mnci/modules.conf
+++ /dev/null
@@ -1,20 +0,0 @@
1alias irda0 pxa_ir
2alias usbd0 usbdmonitor
3alias usbf usb-eth
4alias sound-slot-0 pxa-ac97
5alias sound-slot-1 pxa-ac97
6
7# Affix modules
8alias net-pf-27 affix
9alias char-major-60 affix_rfcomm
10
11# BlueZ modules
12alias net-pf-31 bluez
13alias bt-proto-0 l2cap
14alias bt-proto-2 sco
15alias bt-proto-3 rfcomm
16alias bt-proto-4 bnep
17alias bt-proto-5 cmtp
18alias bt-proto-6 hidp
19alias tty-ldisc-15 hci_uart
20alias char-major-10-250 hci_vhci
diff --git a/meta/recipes-kernel/modutils/files/mnci/modutils.sh b/meta/recipes-kernel/modutils/files/mnci/modutils.sh
deleted file mode 100755
index 378915c270..0000000000
--- a/meta/recipes-kernel/modutils/files/mnci/modutils.sh
+++ /dev/null
@@ -1,10 +0,0 @@
1depmod -Ae
2
3(cat /etc/modules; echo; ) |
4while read module args
5do
6 case "$module" in
7 \#*|"") continue ;;
8 esac
9 modprobe $module $args
10done
diff --git a/meta/recipes-kernel/modutils/files/mtx-1/modules b/meta/recipes-kernel/modutils/files/mtx-1/modules
deleted file mode 100644
index 3eb719acf9..0000000000
--- a/meta/recipes-kernel/modutils/files/mtx-1/modules
+++ /dev/null
@@ -1,3 +0,0 @@
1tun
2ppp_async
3hostap_pci \ No newline at end of file
diff --git a/meta/recipes-kernel/modutils/files/omap1610h2/modules b/meta/recipes-kernel/modutils/files/omap1610h2/modules
deleted file mode 100644
index e69de29bb2..0000000000
--- a/meta/recipes-kernel/modutils/files/omap1610h2/modules
+++ /dev/null
diff --git a/meta/recipes-kernel/modutils/files/omap1610h2/modules.conf b/meta/recipes-kernel/modutils/files/omap1610h2/modules.conf
deleted file mode 100644
index e69de29bb2..0000000000
--- a/meta/recipes-kernel/modutils/files/omap1610h2/modules.conf
+++ /dev/null
diff --git a/meta/recipes-kernel/modutils/files/poodle/modules b/meta/recipes-kernel/modutils/files/poodle/modules
deleted file mode 100644
index 28d14f6584..0000000000
--- a/meta/recipes-kernel/modutils/files/poodle/modules
+++ /dev/null
@@ -1,3 +0,0 @@
1usbdcore
2net_fd
3pxa_bi
diff --git a/meta/recipes-kernel/modutils/files/poodle/modules.conf b/meta/recipes-kernel/modutils/files/poodle/modules.conf
deleted file mode 100644
index 8ff87872f3..0000000000
--- a/meta/recipes-kernel/modutils/files/poodle/modules.conf
+++ /dev/null
@@ -1,4 +0,0 @@
1alias irda0 pxa_ir
2alias usbd0 usbdmonitor
3alias usbf usb-eth
4
diff --git a/meta/recipes-kernel/modutils/files/tosa/modules b/meta/recipes-kernel/modutils/files/tosa/modules
deleted file mode 100644
index 754cc7f606..0000000000
--- a/meta/recipes-kernel/modutils/files/tosa/modules
+++ /dev/null
@@ -1,4 +0,0 @@
1usbdcore
2net_fd
3pxa_bi
4usb_ohci_tc6393 \ No newline at end of file
diff --git a/meta/recipes-kernel/modutils/files/tosa/modules.conf b/meta/recipes-kernel/modutils/files/tosa/modules.conf
deleted file mode 100644
index 8ff87872f3..0000000000
--- a/meta/recipes-kernel/modutils/files/tosa/modules.conf
+++ /dev/null
@@ -1,4 +0,0 @@
1alias irda0 pxa_ir
2alias usbd0 usbdmonitor
3alias usbf usb-eth
4
diff --git a/meta/recipes-kernel/modutils/files/wrt54/modules b/meta/recipes-kernel/modutils/files/wrt54/modules
deleted file mode 100644
index 78f651a83d..0000000000
--- a/meta/recipes-kernel/modutils/files/wrt54/modules
+++ /dev/null
@@ -1,4 +0,0 @@
1et
2wl
3wlcompat
4diag
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.22.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.22.bb
index 0d2f3286e9..91893d7a38 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.22.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.22.bb
@@ -4,10 +4,6 @@ PR = "r0"
4 4
5DEPENDS += "gdbm speex" 5DEPENDS += "gdbm speex"
6 6
7DEFAULT_PREFERENCE_om-gta01 = "-1"
8DEFAULT_PREFERENCE_om-gta02 = "-1"
9DEFAULT_PREFERENCE_motorola-ezx = "-1"
10
11inherit gettext 7inherit gettext
12 8
13SRC_URI += "\ 9SRC_URI += "\
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index ba08dc8ac6..4b3571b618 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -6,12 +6,10 @@ SECTION = "x11/libs"
6PRIORITY = "optional" 6PRIORITY = "optional"
7DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" 7DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
8 8
9INC_PR = "r22" 9INC_PR = "r23"
10 10
11QT_GLFLAGS ?= "-no-opengl" 11QT_GLFLAGS ?= "-no-opengl"
12QT_GLFLAGS_qemux86 = "-opengl" 12QT_GLFLAGS_qemux86 = "-opengl"
13QT_GLFLAGS_emenlow = "-opengl"
14QT_GLFLAGS_atom-pc = "-opengl"
15QT_GLFLAGS_qemuppc = "-opengl" 13QT_GLFLAGS_qemuppc = "-opengl"
16QT_CONFIG_FLAGS += "-no-xinerama -no-xkb ${QT_GLFLAGS}" 14QT_CONFIG_FLAGS += "-no-xinerama -no-xkb ${QT_GLFLAGS}"
17QT_BASE_NAME ?= "qt4" 15QT_BASE_NAME ?= "qt4"
diff --git a/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb b/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb
index a4abea4b8b..01e456e454 100644
--- a/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb
+++ b/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb
@@ -44,11 +44,5 @@ fi
44gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/theme Sato 44gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/theme Sato
45gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/icon_theme Sato 45gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/icon_theme Sato
46gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type bool --set /desktop/poky/interface/touchscreen true 46gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type bool --set /desktop/poky/interface/touchscreen true
47 47gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/font_name "Sans 9"
48if [ "`machine_id`" = "gta01" ]
49then
50 gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/font_name "Sans 6"
51else
52 gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/font_name "Sans 9"
53fi
54} 48}
diff --git a/meta/recipes-support/hal/hal.inc b/meta/recipes-support/hal/hal.inc
index ee6c7ba15d..d276d467b1 100644
--- a/meta/recipes-support/hal/hal.inc
+++ b/meta/recipes-support/hal/hal.inc
@@ -33,7 +33,6 @@ EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \
33MY_ARCH := "${PACKAGE_ARCH}" 33MY_ARCH := "${PACKAGE_ARCH}"
34PACKAGE_ARCH = "${@base_contains('MACHINE_FEATURES', 'acpi', '${MACHINE_ARCH}', '${MY_ARCH}',d)}" 34PACKAGE_ARCH = "${@base_contains('MACHINE_FEATURES', 'acpi', '${MACHINE_ARCH}', '${MY_ARCH}',d)}"
35PACKAGE_ARCH = "${@base_contains('MACHINE_FEATURES', 'pci', '${MACHINE_ARCH}', '${MY_ARCH}',d)}" 35PACKAGE_ARCH = "${@base_contains('MACHINE_FEATURES', 'pci', '${MACHINE_ARCH}', '${MY_ARCH}',d)}"
36PACKAGE_ARCH_emenlow := "${PACKAGE_ARCH}"
37 36
38do_install_append() { 37do_install_append() {
39 install -d ${D}/etc/dbus-1/event.d 38 install -d ${D}/etc/dbus-1/event.d
diff --git a/meta/recipes-support/hal/hal_0.5.14.bb b/meta/recipes-support/hal/hal_0.5.14.bb
index 8b82ca8502..aa67ae6232 100644
--- a/meta/recipes-support/hal/hal_0.5.14.bb
+++ b/meta/recipes-support/hal/hal_0.5.14.bb
@@ -1,6 +1,6 @@
1require hal.inc 1require hal.inc
2 2
3PR = "r3" 3PR = "r4"
4 4
5EXTRA_OECONF += "--with-linux-input-header=${STAGING_INCDIR}/linux/input.h" 5EXTRA_OECONF += "--with-linux-input-header=${STAGING_INCDIR}/linux/input.h"
6EXTRA_OEMAKE += "-e 'udevrulesdir=$(sysconfdir)/udev/rules.d'" 6EXTRA_OEMAKE += "-e 'udevrulesdir=$(sysconfdir)/udev/rules.d'"
diff --git a/meta/recipes-support/hal/hal_git.bb b/meta/recipes-support/hal/hal_git.bb
index 483867f267..e4ec09ba18 100644
--- a/meta/recipes-support/hal/hal_git.bb
+++ b/meta/recipes-support/hal/hal_git.bb
@@ -1,7 +1,7 @@
1require hal.inc 1require hal.inc
2 2
3PV = "0.5.9.1+git${SRCDATE}" 3PV = "0.5.9.1+git${SRCDATE}"
4PR = "r8" 4PR = "r9"
5 5
6SRC_URI = "git://anongit.freedesktop.org/hal/;protocol=git \ 6SRC_URI = "git://anongit.freedesktop.org/hal/;protocol=git \
7 file://20hal \ 7 file://20hal \