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

[Andy Chi]

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

[Lukas Märdian (slyon)]

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").

Especially something like: "Origin: upstream https://github.com/systemd/systemd/commit/f09f6dc2c8f59b2b58159cc413b605a547c8646e"

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

[Andy Chi (andch)]

Hi @slyon,
Thanks for your tip, I'll keep it in mind next time.

diff --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
 new file mode 100644
index 0000000..d303383
--- /dev/null
+++ b/debian/patches/hwdb-Add-mic-mute-key-mapping-for-HP-Elite-x360.patch
@@ -0,0 +1,26 @@
+From f09f6dc2c8f59b2b58159cc413b605a547c8646e Mon Sep 17 00:00:00 2001
+From: Andy Chi <[e-mail]>
+Date: Tue, 29 Mar 2022 15:36:13 +0800
+Subject: [PATCH] hwdb: Add mic mute key mapping for HP Elite x360
+
+On the new Elite x360 2 in 1 HP laptops, the microphone mute hotkey is "Fn+F8" and
+the scancode for this hotkey is 0x81, but this scancode was mapped to
+fn_esc in the HP generic keymap section. To fix this problem, we add
+a machine specific keymap section to add the correct keymap rule.
+---
+ hwdb.d/60-keyboard.hwdb | 2 ++
+ 1 file changed, 2 insertions(+)
+
+Index: systemd-ubuntu-core/hwdb.d/60-keyboard.hwdb
+===================================================================
+--- systemd-ubuntu-core.orig/hwdb.d/60-keyboard.hwdb
++++ systemd-ubuntu-core/hwdb.d/60-keyboard.hwdb
+@@ -600,6 +600,8 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett
+ # HP EliteBook
+ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pnHPEliteBook*:pvr*
+ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHP*:pnHPEliteBook*:pvr*
++# HP Elite x360
++evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHP*:pnHPElite*x360*:*
+ # HP Elite Dragonfly
+ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHP*:pnHPEliteDragonfly*:pvr*
+ # HP ProBook 440 G2
diff --git a/debian/patches/series b/debian/patches/series
index e0a85c5..ddb4740 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -173,3 +173,4 @@ lp1946388-sd-journal-don-t-check-namespaces-if-we-have-no-name.patch
 lp1955997-add-a-allowlist-to-unblock-intel-hid-on-HP-mach.patch
 lp1958284-core-move-reset_arguments-to-the-end-of-main-s-finish.patch
 pid1-set-SYSTEMD_NSS_DYNAMIC_BYPASS-1-env-var-for-dbus-da.patch
+hwdb-Add-mic-mute-key-mapping-for-HP-Elite-x360.patch