Merge ~andch/ubuntu/+source/systemd:ubuntu-jammy-lp1967038 into ~ubuntu-core-dev/ubuntu/+source/systemd:ubuntu-jammy

Proposed by Andy Chi
Status: Merged
Merged at revision: 45e809103de9c356c75b692d35089e8770602617
Proposed branch: ~andch/ubuntu/+source/systemd:ubuntu-jammy-lp1967038
Merge into: ~ubuntu-core-dev/ubuntu/+source/systemd:ubuntu-jammy
Diff against target: 41 lines (+27/-0)
2 files modified
debian/patches/hwdb-Add-mic-mute-key-mapping-for-HP-Elite-x360.patch (+26/-0)
debian/patches/series (+1/-0)
Reviewer Review Type Date Requested Status
Lukas Märdian Approve
Julian Andres Klode Pending
Nick Rosbrook Pending
Dimitri John Ledkov Pending
Review via email: mp+419364@code.launchpad.net

Commit message

Add mic mute key support for HP Elite x360 series (LP: #1967038)

To post a comment you must log in.
Revision history for this message
Lukas Märdian (slyon) wrote :

It would be nice to have some DEP-3 patch headers with this distro patch (https://dep-team.pages.debian.net/deps/dep3/), and also prefix the patch filename with the bug number (e.g. "debian/patches/lp1967038-hwdb-Add-mic-mute-key-mapping-for-HP-Elite-x360.patch").

But this is a time critical patch and things are pretty obvious with this upstream cherry-pick, so we'll keep it as is.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/patches/hwdb-Add-mic-mute-key-mapping-for-HP-Elite-x360.patch b/debian/patches/hwdb-Add-mic-mute-key-mapping-for-HP-Elite-x360.patch
2new file mode 100644
3index 0000000..b6a895a
4--- /dev/null
5+++ b/debian/patches/hwdb-Add-mic-mute-key-mapping-for-HP-Elite-x360.patch
6@@ -0,0 +1,26 @@
7+From f09f6dc2c8f59b2b58159cc413b605a547c8646e Mon Sep 17 00:00:00 2001
8+From: Andy Chi <andy.chi@canonical.com>
9+Date: Tue, 29 Mar 2022 15:36:13 +0800
10+Subject: [PATCH] hwdb: Add mic mute key mapping for HP Elite x360
11+
12+On the new Elite x360 2 in 1 HP laptops, the microphone mute hotkey is "Fn+F8" and
13+the scancode for this hotkey is 0x81, but this scancode was mapped to
14+fn_esc in the HP generic keymap section. To fix this problem, we add
15+a machine specific keymap section to add the correct keymap rule.
16+---
17+ hwdb.d/60-keyboard.hwdb | 2 ++
18+ 1 file changed, 2 insertions(+)
19+
20+Index: systemd-ubuntu-core/hwdb.d/60-keyboard.hwdb
21+===================================================================
22+--- systemd-ubuntu-core.orig/hwdb.d/60-keyboard.hwdb
23++++ systemd-ubuntu-core/hwdb.d/60-keyboard.hwdb
24+@@ -621,6 +621,8 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett
25+ # HP EliteBook
26+ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pnHPEliteBook*:*
27+ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHP*:pnHPEliteBook*:*
28++# HP Elite x360
29++evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHP*:pnHPElite*x360*:*
30+ # HP Elite Dragonfly
31+ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHP*:pnHPEliteDragonfly*:*
32+ # HP ProBook 440 G2
33diff --git a/debian/patches/series b/debian/patches/series
34index e993c0c..a9bae2a 100644
35--- a/debian/patches/series
36+++ b/debian/patches/series
37@@ -86,3 +86,4 @@ lp1929345/hwdb-Add-force-release-for-HP-Omen-15-calculator-key.-205.patch
38 lp1929345/hwdb-Force-release-calculator-key-on-all-HP-OMEN-laptops.patch
39 lp1966381-oomd-calculate-used-memory-with-MemAvailable-instead-of-M.patch
40 lp1926860-hwdb-remove-the-tablet-pad-entry-for-the-UC-Logic-1060N.patch
41+hwdb-Add-mic-mute-key-mapping-for-HP-Elite-x360.patch

Subscribers

People subscribed via source and target branches