From 8416624e61a0ced48c633917fa838ebddd7aeefb Mon Sep 17 00:00:00 2001 From: Alexander Pyhalov Date: Tue, 14 Feb 2017 23:47:47 +0300 Subject: [PATCH] 7866 hal doesn't detect keyboard after xkeyboard-config update --- components/x11/xkeyboard-config/Makefile | 1 + components/x11/xkeyboard-config/files/xkbtable.map | 142 +++++++++++++++++++++ .../x11/xkeyboard-config/xkeyboard-config.p5m | 4 + 3 files changed, 147 insertions(+) create mode 100644 components/x11/xkeyboard-config/files/xkbtable.map diff --git a/components/x11/xkeyboard-config/Makefile b/components/x11/xkeyboard-config/Makefile index ef9b4a68b..2de940b61 100644 --- a/components/x11/xkeyboard-config/Makefile +++ b/components/x11/xkeyboard-config/Makefile @@ -16,6 +16,7 @@ include ../../../make-rules/shared-macros.mk COMPONENT_NAME= xkeyboard-config COMPONENT_VERSION= 2.20 +COMPONENT_REVISION= 1 COMPONENT_SUMMARY= X Keyboard Configuration Database COMPONENT_PROJECT_URL= https://freedesktop.org/wiki/Software/XKeyboardConfig/ COMPONENT_FMRI= x11/keyboard/data-xkb diff --git a/components/x11/xkeyboard-config/files/xkbtable.map b/components/x11/xkeyboard-config/files/xkbtable.map new file mode 100644 index 000000000..4a340bafa --- /dev/null +++ b/components/x11/xkeyboard-config/files/xkbtable.map @@ -0,0 +1,142 @@ +# +# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, and/or sell copies of the Software, and to permit persons +# to whom the Software is furnished to do so, provided that the above +# copyright notice(s) and this permission notice appear in all copies of +# the Software and that both the above copyright notice(s) and this +# permission notice appear in supporting documentation. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# +# Except as contained in this notice, the name of a copyright holder +# shall not be used in advertising or otherwise to promote the sale, use +# or other dealings in this Software without prior written authorization +# of the copyright holder. +# +# +# + +# +# xkbtable.map +# +# The xkbtable map associates a keyboard with its corresponding XKB names, +# in order to associate it +# +# The keyboard Type and Layout are generally obtained from the kernel using +# appropriate ioctl calls. The keyboard Type is stored in a keyboard PROM. +# The keyboard Layout may be stored in a keyboard PROM or determined by a +# DIP switch setting. +# +# Format of an entry: +# Type Layout XKB_Keymap XKB_Model XKB_Layout +# +# The XKB_Model and XKB_Layout fields are optional, but you must specify an +# XKB_model in order to specify an XKB_Layout +# +# The XKB_Keymap field may be - to specify not setting the keymap and using +# the XKB_Model and XKB_Layout to lookup the rules in the xorg.rules file +# +# The layout field may be a * to indicate a default entry for a keyboard +# of the specified type if an exact match is not found. +# +# The type & layout fields may be both be a * to indicate a default entry +# for a keyboard if an exact match is not found, and a default entry of +# the correct type is not found. +# +############################################################################## +# +# Type 101 Keyboards (Solaris x86 Keyboards) +# +101 * - pc105 us # MS_US101A_x86 +101 1 - pc105 us # US101A_x86 +101 34 - pc105 # J3100_x86 +101 35 - pc105 fr # France_x86 +101 36 - pc105 dk # Denmark_x86 +101 37 - pc105 de # Germany_x86 +101 38 - pc105 it # Italy_x86 +101 39 - pc105 nl # Netherland_x86 +101 40 - pc105 no # Norway_x86 +101 41 - pc105 pt # Portugal_x86 +101 42 - pc105 es # Spain_x86 +101 43 - pc105 se # Sweden_x86 +101 44 - pc105 fr_CH # Switzer_Fr_x86 +101 45 - pc105 de_CH # Switzer_Ge_x86 +101 46 - pc105 gb # UK_x86 +101 47 - pc105 kr # Korea_x86 +101 48 - pc105 tw # Taiwan_x86 +101 49 - jp106 jp # Japan_x86 +101 50 - pc105 fr_CA # Canada_Fr2_x86 +101 51 - pc105 hu # Hungary_x86 +101 52 - pc105 pl # Poland_x86 +101 53 - pc105 cz # Czech_x86 +101 54 - pc105 ru # Russia_x86 +101 55 - pc105 lv # Latvia_x86 +101 56 - pc105 tr # Turkey_x86 +101 57 - pc105 el # Greece_x86 +101 59 - pc105 lt # Lithuania_x86 +101 1001 - pc105 us # MS_US101A_x86 +# +# Type 6 USB Keyboards +# +6 * - sun_type6_usb us # US6_usb +6 6 - sun_type6_euro_usb dk # Denmark6_usb +6 7 - sun_type6_euro_usb fi # Finnish6_usb +6 8 - sun_type6_euro_usb fr # France6_usb +6 9 - sun_type6_euro_usb de # Germany6_usb +6 14 - sun_type6_euro_usb it # Italy6_usb +6 15 - sun_type7_jp_usb jp # Japan7_usb +6 16 - sun_type6_usb kr # Korea6_usb +6 18 - sun_type6_euro_usb nl # Netherland6_usb +6 19 - sun_type6_euro_usb no # Norway6_usb +6 22 - sun_type6_euro_usb pt # Portugal6_usb +6 23 - sun_type6_euro_usb ru # Russia6_usb +6 25 - sun_type6_euro_usb es # Spain6_usb +6 26 - sun_type6_euro_usb se # Sweden6_usb +6 27 - sun_type6_euro_usb ch(fr) # Switzer_Fr6_usb +6 28 - sun_type6_euro_usb ch(de) # Switzer_Ge6_usb +6 30 - sun_type6_usb tw # Taiwan6_usb +6 32 - sun_type6_euro_usb gb # UK6_usb +6 33 - sun_type6_usb us # US6_usb +6 1 - sun_type6_euro_usb ara # Arabic6_usb +6 2 - sun_type6_euro_usb be # Belgian6_usb +6 31 - sun_type6_euro_usb tr # TurkeyQ6_usb +6 35 - sun_type6_euro_usb tr(f) # TurkeyF6_usb +6 271 - sun_type6_jp_usb jp # Japan6_usb +6 264 - sun_type6_euro_usb al # Albanian6_usb +6 261 - sun_type6_euro_usb by # Belarusian6_usb +6 260 - sun_type6_euro_usb bg # Bulgarian6_usb +6 259 - sun_type6_euro_usb hr # Croatian6_usb +6 5 - sun_type6_euro_usb cz # Czech6_usb +6 4 - sun_type6_euro_usb ca # French-Canadian6_usb +6 12 - sun_type6_euro_usb hu # Hungarian6_usb +6 10 - sun_type6_euro_usb gr # Greek6_usb +6 17 - sun_type6_usb latam # Latin-American6_usb +6 265 - sun_type6_euro_usb lt # Lithuanian6_usb +6 266 - sun_type6_euro_usb lv # Latvian6_usb +6 267 - sun_type6_euro_usb mk # Macedonian6_usb +6 263 - sun_type6_euro_usb mt # Malta_UK6_usb +6 262 - sun_type6_euro_usb mt(us) # Malta_US6_usb +6 21 - sun_type6_euro_usb pl # Polish6_usb +6 257 - sun_type6_euro_usb sr # Serbia-And-Montenegro6_usb +6 256 - sun_type6_euro_usb si # Slovenian6_usb +6 24 - sun_type6_euro_usb sk # Slovakian6_usb +6 3 - sun_type6_usb ca(multi) # Canada_Bi6_usb +6 272 - sun_type6_usb br # Brazil6_usb +6 273 - sun_type6_usb us(dvorak) # Dvorak6_usb +6 274 - sun_type6_euro_usb ee # Estonia6_usb +6 275 - sun_type6_euro_usb ro # Romania6_usb +6 11 - sun_type6_usb il # Israel6_usb + diff --git a/components/x11/xkeyboard-config/xkeyboard-config.p5m b/components/x11/xkeyboard-config/xkeyboard-config.p5m index ad28611bb..bc92df9e5 100644 --- a/components/x11/xkeyboard-config/xkeyboard-config.p5m +++ b/components/x11/xkeyboard-config/xkeyboard-config.p5m @@ -22,6 +22,10 @@ set name=org.opensolaris.consolidation value=$(CONSOLIDATION) license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)' +# HAL needs /usr/X11/lib/X11/xkb/xkbtable.map, so both this file +# and link below are required. +file files/xkbtable.map path=/usr/share/X11/xkb/xkbtable.map + link path=usr/X11/lib/X11/xkb target=../../../share/X11/xkb link path=usr/X11/share/X11/xkb target=../../../share/X11/xkb -- 2.11.4.GIT