Switch from external keymaps to internal (hwdb) keymaps

This commit imports the new internal keyboard handling from upstream.
This is a combination of many upstream commits, including those
that added code, removed old code, and updated the hwdb.
Some commits (hwdb ones specifically) were unrelated but brought
in anyways to keep the whole hwdb consistent.  Each upstream
commit included is as follows:

9d7d42bc406a2ac04639674281ce3ff6beeda790 - internal keymap support
0c959b39175b126fdb70ae00de37ca6d9c8ca3a1 - hwdb: keyboard -- add file
e8193554925a22b63bef0e77b8397b56d63a91ff - hwdb: keyboard -- update comments
c79d894d590fc9df4861738555cc43c477e33376 - hwdb: import data
aedc2eddd16e48d468e6ad0aea2caf00c7d37365 - hwdb: keyboard update
97a9313cafccf772ce03f5ebd36fe4d9d8412583 - hwdb: drop non-existant Samsung 900XC3 from keymap
ddc77f62244bb41d5c8261517e2e1ff1b763fc94 - switch from udev keymaps to hwdb
0c3815773331b263713f4f7b9d80bc1ca159338e - also remove keymaps-force-release directory
1b6bce89b3383904d0dab619dd38bff673f7286e - keymap: re-add Logitech USB corded/cordless models
bf89b99c5a39115112c2eda4c2103e2db54988d2 - 60-keyboard.hwdb: Fix syntax error
ce39bb6909578017aa10031638e724e038f0b859 - hwdb: data update, upstream
884c86812c51479496edd50b278383d7bb67baf0 - rules: keyboard - use builtin command

All code from each of the above commits is attributed to the original
authors.

There were some adjustments made in order to support the code differences
between upstream and eudev, which was done by myself.

Also of note is that the code can still be disabled via the --disable-keymaps
configure option, which was removed from upstream.

Signed-off-by: Ian Stakenvicius <axs@gentoo.org>

1 files changed, 186 insertions, 3 deletions

diff --git a/hwdb/20-OUI.hwdb b/hwdb/20-OUI.hwdb
index 8b402f9b4a..5ebd6413b9 100644
--- a/hwdb/20-OUI.hwdb
+++ b/hwdb/20-OUI.hwdb
@@ -7295,7 +7295,7 @@ OUI:0050C298C*
  ID_OUI_FROM_DATABASE=MGM-Devices Oy
 
 OUI:0050C298D*
- ID_OUI_FROM_DATABASE=Mecos Traxler AG
+ ID_OUI_FROM_DATABASE=Mecos AG
 
 OUI:0050C298E*
  ID_OUI_FROM_DATABASE=Link Technologies, Inc
@@ -13099,6 +13099,48 @@ OUI:40D85512D*
 OUI:40D85512E*
  ID_OUI_FROM_DATABASE=Canfield Scientific, Inc.
 
+OUI:40D855130*
+ ID_OUI_FROM_DATABASE=GSP Sprachtechnologie GmbH
+
+OUI:40D855131*
+ ID_OUI_FROM_DATABASE=EMAC, INC.
+
+OUI:40D855132*
+ ID_OUI_FROM_DATABASE=AeroVision Avionics, Inc
+
+OUI:40D855133*
+ ID_OUI_FROM_DATABASE=Tattile srl
+
+OUI:40D855134*
+ ID_OUI_FROM_DATABASE=digitech GmbH & Co. KG
+
+OUI:40D855135*
+ ID_OUI_FROM_DATABASE=GLOBALCOM ENGINEERING SRL
+
+OUI:40D855136*
+ ID_OUI_FROM_DATABASE=Devriecom B.V.
+
+OUI:40D855137*
+ ID_OUI_FROM_DATABASE=GDE Polska
+
+OUI:40D855138*
+ ID_OUI_FROM_DATABASE=Calon Associates Limited
+
+OUI:40D855139*
+ ID_OUI_FROM_DATABASE=WOW System
+
+OUI:40D85513A*
+ ID_OUI_FROM_DATABASE=Supplier Ind. e Com de Eletroeletrônicos
+
+OUI:40D85513B*
+ ID_OUI_FROM_DATABASE=Davin Technologies Co.,Ltd
+
+OUI:40D85513C*
+ ID_OUI_FROM_DATABASE=shanghai anjian Information technology co. , ltd.
+
+OUI:40D85513D*
+ ID_OUI_FROM_DATABASE=Perm Scientific-Industrial Instrument Making Company JSC
+
 OUI:000000*
  ID_OUI_FROM_DATABASE=XEROX CORPORATION
 
@@ -14675,7 +14717,7 @@ OUI:00020D*
  ID_OUI_FROM_DATABASE=Micronpc.com
 
 OUI:00020E*
- ID_OUI_FROM_DATABASE=ECI Telecom, Ltd., NSD-US
+ ID_OUI_FROM_DATABASE=ECI Telecom, Ltd
 
 OUI:00020F*
  ID_OUI_FROM_DATABASE=AATR
@@ -46093,6 +46135,9 @@ OUI:0075E1*
 OUI:00789E*
  ID_OUI_FROM_DATABASE=SAGEMCOM
 
+OUI:007DFA*
+ ID_OUI_FROM_DATABASE=Volkswagen Group of America
+
 OUI:007F28*
  ID_OUI_FROM_DATABASE=Actiontec Electronics, Inc
 
@@ -51148,6 +51193,9 @@ OUI:044BFF*
 OUI:044CEF*
  ID_OUI_FROM_DATABASE=Fujian Sanao Technology Co.,Ltd
 
+OUI:044F8B*
+ ID_OUI_FROM_DATABASE=Adapteva, Inc.
+
 OUI:044FAA*
  ID_OUI_FROM_DATABASE=Ruckus Wireless
 
@@ -52102,6 +52150,9 @@ OUI:0C57EB*
 OUI:0C5A19*
  ID_OUI_FROM_DATABASE=Axtion Sdn Bhd
 
+OUI:0C5CD8*
+ ID_OUI_FROM_DATABASE=DOLI Elektronik GmbH
+
 OUI:0C6076*
  ID_OUI_FROM_DATABASE=Hon Hai Precision Ind. Co.,Ltd.
 
@@ -52171,6 +52222,9 @@ OUI:0C93FB*
 OUI:0C96BF*
  ID_OUI_FROM_DATABASE=Huawei Technologies Co., Ltd
 
+OUI:0C9B13*
+ ID_OUI_FROM_DATABASE=Shanghai Magic Mobile Telecommunication Co.Ltd.
+
 OUI:0C9D56*
  ID_OUI_FROM_DATABASE=Consort Controls Ltd
 
@@ -52618,6 +52672,9 @@ OUI:141BF0*
 OUI:1423D7*
  ID_OUI_FROM_DATABASE=EUTRONIX CO., LTD.
 
+OUI:142BD2*
+ ID_OUI_FROM_DATABASE=Armtel Ltd.
+
 OUI:142D8B*
  ID_OUI_FROM_DATABASE=Incipio Technologies, Inc
 
@@ -52924,6 +52981,9 @@ OUI:187A93*
 OUI:187C81*
  ID_OUI_FROM_DATABASE=Valeo Vision Systems
 
+OUI:187ED5*
+ ID_OUI_FROM_DATABASE=shenzhen kaism technology Co. Ltd
+
 OUI:1880CE*
  ID_OUI_FROM_DATABASE=Barberry Solutions Ltd
 
@@ -53122,6 +53182,9 @@ OUI:1C48F9*
 OUI:1C4AF7*
  ID_OUI_FROM_DATABASE=AMON INC
 
+OUI:1C4BB9*
+ ID_OUI_FROM_DATABASE=SMG ENTERPRISE, LLC
+
 OUI:1C4BD6*
  ID_OUI_FROM_DATABASE=AzureWave
 
@@ -53608,6 +53671,9 @@ OUI:245FDF*
 OUI:246278*
  ID_OUI_FROM_DATABASE=sysmocom - systems for mobile communications GmbH
 
+OUI:2464EF*
+ ID_OUI_FROM_DATABASE=CYG SUNRI CO.,LTD.
+
 OUI:246511*
  ID_OUI_FROM_DATABASE=AVM GmbH
 
@@ -53626,6 +53692,9 @@ OUI:24767D*
 OUI:247703*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:248000*
+ ID_OUI_FROM_DATABASE=Westcontrol AS
+
 OUI:2481AA*
  ID_OUI_FROM_DATABASE=KSH International Co., Ltd.
 
@@ -53833,6 +53902,9 @@ OUI:284846*
 OUI:284C53*
  ID_OUI_FROM_DATABASE=Intune Networks
 
+OUI:284D92*
+ ID_OUI_FROM_DATABASE=Luminator
+
 OUI:284FCE*
  ID_OUI_FROM_DATABASE=Liaoning Wontel Science and Technology Development Co.,Ltd.
 
@@ -54109,12 +54181,18 @@ OUI:2C44FD*
 OUI:2C542D*
  ID_OUI_FROM_DATABASE=CISCO SYSTEMS, INC.
 
+OUI:2C553C*
+ ID_OUI_FROM_DATABASE=Gainspeed, Inc.
+
 OUI:2C59E5*
  ID_OUI_FROM_DATABASE=Hewlett Packard
 
 OUI:2C5AA3*
  ID_OUI_FROM_DATABASE=PROMATE ELECTRONIC CO.LTD
 
+OUI:2C5FF3*
+ ID_OUI_FROM_DATABASE=Pertronic Industries
+
 OUI:2C625A*
  ID_OUI_FROM_DATABASE=Finest Security Systems Co., Ltd
 
@@ -54526,6 +54604,9 @@ OUI:3451C9*
 OUI:345B11*
  ID_OUI_FROM_DATABASE=EVI HEAT AB
 
+OUI:346178*
+ ID_OUI_FROM_DATABASE=The Boeing Company
+
 OUI:34684A*
  ID_OUI_FROM_DATABASE=Teraworks Co., Ltd.
 
@@ -54958,6 +55039,9 @@ OUI:3C0FC1*
 OUI:3C106F*
  ID_OUI_FROM_DATABASE=ALBAHITH TECHNOLOGIES
 
+OUI:3C15EA*
+ ID_OUI_FROM_DATABASE=TESCOM CO., LTD.
+
 OUI:3C1915*
  ID_OUI_FROM_DATABASE=GFI Chrono Time
 
@@ -56140,6 +56224,9 @@ OUI:50252B*
 OUI:502690*
  ID_OUI_FROM_DATABASE=Fujitsu Limited
 
+OUI:5027C7*
+ ID_OUI_FROM_DATABASE=TECHNART Co.,Ltd
+
 OUI:502A7E*
  ID_OUI_FROM_DATABASE=Smart electronic GmbH
 
@@ -56284,6 +56371,9 @@ OUI:50AF73*
 OUI:50B7C3*
  ID_OUI_FROM_DATABASE=Samsung Electronics CO., LTD
 
+OUI:50B888*
+ ID_OUI_FROM_DATABASE=wi2be Tecnologia S/A
+
 OUI:50B8A2*
  ID_OUI_FROM_DATABASE=ImTech Technologies LLC,
 
@@ -56480,7 +56570,7 @@ OUI:54A51B*
  ID_OUI_FROM_DATABASE=Shenzhen Huawei Communication Technologies Co., Ltd
 
 OUI:54A54B*
- ID_OUI_FROM_DATABASE=NSC Communiaction Siberia Ltd
+ ID_OUI_FROM_DATABASE=NSC Communications Siberia Ltd
 
 OUI:54A619*
  ID_OUI_FROM_DATABASE=Alcatel-Lucent Shanghai Bell Co., Ltd
@@ -56614,6 +56704,9 @@ OUI:5856E8*
 OUI:58570D*
  ID_OUI_FROM_DATABASE=Danfoss Solar Inverters
 
+OUI:58639A*
+ ID_OUI_FROM_DATABASE=TPL SYSTEMES
+
 OUI:5865E6*
  ID_OUI_FROM_DATABASE=INFOMARK CO., LTD.
 
@@ -56686,6 +56779,9 @@ OUI:589835*
 OUI:58986F*
  ID_OUI_FROM_DATABASE=Revolution Display
 
+OUI:58A2B5*
+ ID_OUI_FROM_DATABASE=LG Electronics
+
 OUI:58A76F*
  ID_OUI_FROM_DATABASE=iD corporation
 
@@ -57037,6 +57133,9 @@ OUI:601E02*
 OUI:6021C0*
  ID_OUI_FROM_DATABASE=Murata Manufactuaring Co.,Ltd.
 
+OUI:6024C1*
+ ID_OUI_FROM_DATABASE=Jiangsu Zhongxun Electronic Technology Co., Ltd
+
 OUI:602A54*
  ID_OUI_FROM_DATABASE=CardioTek B.V.
 
@@ -57157,6 +57256,9 @@ OUI:60A10A*
 OUI:60A44C*
  ID_OUI_FROM_DATABASE=ASUSTek COMPUTER INC.
 
+OUI:60A9B0*
+ ID_OUI_FROM_DATABASE=Merchandising Technologies, Inc
+
 OUI:60B185*
  ID_OUI_FROM_DATABASE=ATH system
 
@@ -57895,6 +57997,9 @@ OUI:6C5779*
 OUI:6C5A34*
  ID_OUI_FROM_DATABASE=Shenzhen Haitianxiong Electronic Co., Ltd.
 
+OUI:6C5AB5*
+ ID_OUI_FROM_DATABASE=TCL Technoly Electronics (Huizhou) Co., Ltd.
+
 OUI:6C5CDE*
  ID_OUI_FROM_DATABASE=SunReports, Inc.
 
@@ -58687,6 +58792,9 @@ OUI:78593E*
 OUI:78595E*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:785968*
+ ID_OUI_FROM_DATABASE=Hon Hai Precision Ind.Co.,Ltd.
+
 OUI:785C72*
  ID_OUI_FROM_DATABASE=Hioso Technology Co., Ltd.
 
@@ -58840,6 +58948,9 @@ OUI:78D5B5*
 OUI:78D6F0*
  ID_OUI_FROM_DATABASE=Samsung Electro Mechanics
 
+OUI:78D99F*
+ ID_OUI_FROM_DATABASE=NuCom HK Ltd.
+
 OUI:78DAB3*
  ID_OUI_FROM_DATABASE=GBO Technology
 
@@ -58909,6 +59020,9 @@ OUI:7C0507*
 OUI:7C051E*
  ID_OUI_FROM_DATABASE=RAFAEL LTD.
 
+OUI:7C0623*
+ ID_OUI_FROM_DATABASE=Ultra Electronics, CIS
+
 OUI:7C08D9*
  ID_OUI_FROM_DATABASE=Shanghai Engineering Research Center for Broadband Technologies and Applications
 
@@ -59416,12 +59530,18 @@ OUI:8400D2*
 OUI:840B2D*
  ID_OUI_FROM_DATABASE=SAMSUNG ELECTRO-MECHANICS CO., LTD
 
+OUI:840F45*
+ ID_OUI_FROM_DATABASE=Shanghai GMT Digital Technologies Co., Ltd
+
 OUI:841715*
  ID_OUI_FROM_DATABASE=GP Electronics (HK) Ltd.
 
 OUI:841888*
  ID_OUI_FROM_DATABASE=Juniper Networks
 
+OUI:841B38*
+ ID_OUI_FROM_DATABASE=Shenzhen Excelsecu Data Technology Co.,Ltd
+
 OUI:841B5E*
  ID_OUI_FROM_DATABASE=NETGEAR
 
@@ -59689,6 +59809,9 @@ OUI:8841C1*
 OUI:8843E1*
  ID_OUI_FROM_DATABASE=CISCO SYSTEMS, INC.
 
+OUI:8844F6*
+ ID_OUI_FROM_DATABASE=Nokia Corporation
+
 OUI:88462A*
  ID_OUI_FROM_DATABASE=Telechips Inc.
 
@@ -59725,6 +59848,9 @@ OUI:887398*
 OUI:887556*
  ID_OUI_FROM_DATABASE=Cisco
 
+OUI:88789C*
+ ID_OUI_FROM_DATABASE=Game Technologies SA
+
 OUI:8886A0*
  ID_OUI_FROM_DATABASE=Simton Technologies, Ltd.
 
@@ -60562,6 +60688,9 @@ OUI:94DE0E*
 OUI:94DE80*
  ID_OUI_FROM_DATABASE=GIGA-BYTE TECHNOLOGY CO.,LTD.
 
+OUI:94DF4E*
+ ID_OUI_FROM_DATABASE=Wistron InfoComm(Kunshan)Co.,Ltd.
+
 OUI:94DF58*
  ID_OUI_FROM_DATABASE=IJ Electron CO.,Ltd.
 
@@ -60979,6 +61108,9 @@ OUI:9C9811*
 OUI:9C9C1D*
  ID_OUI_FROM_DATABASE=Starkey Labs Inc.
 
+OUI:9CA10A*
+ ID_OUI_FROM_DATABASE=SCLE SFE
+
 OUI:9CA134*
  ID_OUI_FROM_DATABASE=Nike, Inc.
 
@@ -62410,6 +62542,9 @@ OUI:B439D6*
 OUI:B43DB2*
  ID_OUI_FROM_DATABASE=Degreane Horizon
 
+OUI:B43E3B*
+ ID_OUI_FROM_DATABASE=Viableware, Inc
+
 OUI:B4417A*
  ID_OUI_FROM_DATABASE=ShenZhen Gongjin Electronics Co.,Ltd
 
@@ -62488,6 +62623,9 @@ OUI:B4A4E3*
 OUI:B4A5A9*
  ID_OUI_FROM_DATABASE=MODI GmbH
 
+OUI:B4A82B*
+ ID_OUI_FROM_DATABASE=Histar
+
 OUI:B4A95A*
  ID_OUI_FROM_DATABASE=Avaya, Inc
 
@@ -63037,6 +63175,9 @@ OUI:BC926B*
 OUI:BC9680*
  ID_OUI_FROM_DATABASE=Shenzhen Gongjin Electronics Co.,Ltd
 
+OUI:BC9889*
+ ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Tech.Co.,Ltd.
+
 OUI:BC99BC*
  ID_OUI_FROM_DATABASE=FonSee Technology Inc.
 
@@ -63307,6 +63448,9 @@ OUI:C0C3B6*
 OUI:C0C520*
  ID_OUI_FROM_DATABASE=Ruckus Wireless
 
+OUI:C0C687*
+ ID_OUI_FROM_DATABASE=Cisco SPVTG
+
 OUI:C0C946*
  ID_OUI_FROM_DATABASE=MITSUYA LABORATORIES INC.
 
@@ -63514,6 +63658,9 @@ OUI:C49300*
 OUI:C49313*
  ID_OUI_FROM_DATABASE=100fio networks technology llc
 
+OUI:C49380*
+ ID_OUI_FROM_DATABASE=Speedytel technology
+
 OUI:C495A2*
  ID_OUI_FROM_DATABASE=SHENZHEN WEIJIU INDUSTRY AND TRADE DEVELOPMENT CO., LTD
 
@@ -64177,6 +64324,9 @@ OUI:D023DB*
 OUI:D02788*
  ID_OUI_FROM_DATABASE=Hon Hai Precision Ind.Co.Ltd
 
+OUI:D02C45*
+ ID_OUI_FROM_DATABASE=littleBits Electronics, Inc.
+
 OUI:D02DB3*
  ID_OUI_FROM_DATABASE=Huawei Technologies Co., Ltd
 
@@ -64267,6 +64417,9 @@ OUI:D08CFF*
 OUI:D093F8*
  ID_OUI_FROM_DATABASE=Stonestreet One LLC
 
+OUI:D095C7*
+ ID_OUI_FROM_DATABASE=Pantech Co., Ltd.
+
 OUI:D09B05*
  ID_OUI_FROM_DATABASE=Emtronix
 
@@ -64588,6 +64741,9 @@ OUI:D4AAFF*
 OUI:D4AC4E*
  ID_OUI_FROM_DATABASE=BODi rS, LLC
 
+OUI:D4AD2D*
+ ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Tech.Co.,Ltd.
+
 OUI:D4AE52*
  ID_OUI_FROM_DATABASE=Dell Inc
 
@@ -64714,6 +64870,9 @@ OUI:D824BD*
 OUI:D826B9*
  ID_OUI_FROM_DATABASE=Guangdong Coagent Electronics S &T Co., Ltd.
 
+OUI:D8270C*
+ ID_OUI_FROM_DATABASE=MaxTronic International Co., Ltd.
+
 OUI:D828C9*
  ID_OUI_FROM_DATABASE=General Electric Consumer and Industrial
 
@@ -65134,6 +65293,9 @@ OUI:DCF858*
 OUI:DCFAD5*
  ID_OUI_FROM_DATABASE=STRONG Ges.m.b.H.
 
+OUI:DCFB02*
+ ID_OUI_FROM_DATABASE=Buffalo Inc.
+
 OUI:E005C5*
  ID_OUI_FROM_DATABASE=TP-LINK Technologies Co.,Ltd.
 
@@ -65302,6 +65464,9 @@ OUI:E0ABFE*
 OUI:E0AE5E*
  ID_OUI_FROM_DATABASE=ALPS Co,. Ltd.
 
+OUI:E0AEB2*
+ ID_OUI_FROM_DATABASE=Bender GmbH & Co.KG
+
 OUI:E0AEED*
  ID_OUI_FROM_DATABASE=LOENK
 
@@ -65920,6 +66085,9 @@ OUI:EC233D*
 OUI:EC2368*
  ID_OUI_FROM_DATABASE=IntelliVoice Co.,Ltd.
 
+OUI:EC2AF0*
+ ID_OUI_FROM_DATABASE=Ypsomed AG
+
 OUI:EC2C49*
  ID_OUI_FROM_DATABASE=University of Tokyo
 
@@ -66646,6 +66814,9 @@ OUI:F80F84*
 OUI:F81037*
  ID_OUI_FROM_DATABASE=Atopia Systems, LP
 
+OUI:F81547*
+ ID_OUI_FROM_DATABASE=Avaya, Inc
+
 OUI:F81654*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
@@ -66694,6 +66865,9 @@ OUI:F83DFF*
 OUI:F842FB*
  ID_OUI_FROM_DATABASE=Yasuda Joho Co.,ltd.
 
+OUI:F845AD*
+ ID_OUI_FROM_DATABASE=Konka Group Co., Ltd.
+
 OUI:F8462D*
  ID_OUI_FROM_DATABASE=SYNTEC Incorporation
 
@@ -66703,6 +66877,9 @@ OUI:F8472D*
 OUI:F84897*
  ID_OUI_FROM_DATABASE=Hitachi, Ltd.
 
+OUI:F84A7F*
+ ID_OUI_FROM_DATABASE=Innometriks Inc
+
 OUI:F84ABF*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -66718,6 +66895,9 @@ OUI:F8516D*
 OUI:F852DF*
  ID_OUI_FROM_DATABASE=VNL Europe AB
 
+OUI:F854AF*
+ ID_OUI_FROM_DATABASE=ECI Telecom Ltd.
+
 OUI:F85BC9*
  ID_OUI_FROM_DATABASE=M-Cube Spa
 
@@ -66787,6 +66967,9 @@ OUI:F89FB8*
 OUI:F8A03D*
  ID_OUI_FROM_DATABASE=Dinstar Technologies Co., Ltd.
 
+OUI:F8A45F*
+ ID_OUI_FROM_DATABASE=Beijing Xiaomi communications co.,ltd
+
 OUI:F8A9DE*
  ID_OUI_FROM_DATABASE=PUISSANCE PLUS