Ubuntu
systemd package

Merge ~os369510/ubuntu/+source/systemd:ubuntu-impish into ~ubuntu-core-dev/ubuntu/+source/systemd:ubuntu-impish

  1. Git
  2. lp:~os369510/ubuntu/+source/systemd
  3. ubuntu-impish
  4. Merge into ubuntu-impish
Proposed by jeremyszu
Status: Merged
Merge reported by: Lukas Märdian
Merged at revision: 4f2b260b95bb40c7b377f346c7a4f13d468a4e98
Proposed branch: ~os369510/ubuntu/+source/systemd:ubuntu-impish
Merge into: ~ubuntu-core-dev/ubuntu/+source/systemd:ubuntu-impish
Diff against target: 79 lines (+65/-0)
2 files modified
debian/patches/lp1966179-add-more-hp-dmi-to-unblock-intel-hid-event.patch (+64/-0)
debian/patches/series (+1/-0)
Reviewer Review Type Date Requested Status
Lukas Märdian Approve
Julian Andres Klode Abstain
Nick Rosbrook Pending
Dimitri John Ledkov Pending
Review via email: mp+418431@code.launchpad.net

Commit message

Same story from lp1955997, some HP machines are using intel-hid instead
of HPQ6001. Thus, add them in the allowing list.
Specify the dmi string precisely to prevent introduce the regression.

Below launchpad tickets could be reference:
from 1966170:
pnHPProBook44014inchG9NotebookPC
pnHPProBook45015.6inchG9NotebookPC

from 1965898:
pnHPElitex36083013inchG92-in-1NotebookPC

from 1966014:
pnHPEliteBook104014inchG9NotebookPC
pnHPEliteBook84014inchG9NotebookPC
pnHPElitex360104014inchG92-in-1NotebookPC
pnHPEliteBook86016inchG9NotebookPC

from 1964913:
pnHPEliteBook64014inchG9NotebookPC
pnHPEliteBook65015.6inchG9NotebookPC

In the mail from HP (please see the lp1966179), HP also confirmed the
previous two platforms' dmi string need to adjust.
pnHPZBookFury16G9MobileWorkstationPC
pnHPZBookStudio16inchG9MobileWorkstationPC

To post a comment you must log in.
Revision history for this message
Julian Andres Klode (juliank) :
review: Abstain
~os369510/ubuntu/+source/systemd:ubuntu-impish updated
4f2b260... by jeremyszu

Add 630/830 13 inch dmi string

Revision history for this message
Lukas Märdian (slyon) wrote :

LGTM overall. we're re-using the allow-list introduced in LP: #1955997 that only affects HP machines, so I consider this a low rist change.

I've combined your two top commits into a single one, mentioning the LP: #1966179 bug number, so it shows up correctly in the debian/changelog.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/patches/lp1966179-add-more-hp-dmi-to-unblock-intel-hid-event.patch b/debian/patches/lp1966179-add-more-hp-dmi-to-unblock-intel-hid-event.patch
0new file mode 1006440new file mode 100644
index 0000000..20842cd
--- /dev/null
+++ b/debian/patches/lp1966179-add-more-hp-dmi-to-unblock-intel-hid-event.patch
@@ -0,0 +1,64 @@
1From: Jeremy Szu <jeremy.szu@canonical.com>
2Date: Mon, 4 Apr 2022 18:19:44 +0000
3Subject: lp1966179-add-more-hp-dmi-to-unblock-intel-hid-event
4
5Same story from lp1955997, some HP machines are using intel-hid instead
6of HPQ6001. Thus, add them in the allowing list.
7Specify the dmi string precisely to prevent introduce the regression.
8
9Below launchpad tickets could be reference:
10from 1966170:
11pnHPProBook44014inchG9NotebookPC
12pnHPProBook45015.6inchG9NotebookPC
13
14from 1965898:
15pnHPElitex36083013inchG92-in-1NotebookPC
16
17from 1966014:
18pnHPEliteBook104014inchG9NotebookPC
19pnHPEliteBook84014inchG9NotebookPC
20pnHPElitex360104014inchG92-in-1NotebookPC
21pnHPEliteBook86016inchG9NotebookPC
22
23from 1964913:
24pnHPEliteBook64014inchG9NotebookPC
25pnHPEliteBook65015.6inchG9NotebookPC
26
27In the mail from HP (please see the lp1966179), HP also confirmed the
28previous two platforms' dmi string need to adjust.
29pnHPZBookFury16G9MobileWorkstationPC
30pnHPZBookStudio16inchG9MobileWorkstationPC
31
32In the MM channel from BillYu and AndyChi, for Thanos13 and Warpath13
33pnHPEliteBook83013inchG9NotebookPC
34pnHPEliteBook63013inchG9NotebookPC
35---
36 hwdb.d/60-keyboard.hwdb | 15 +++++++++++++--
37 1 file changed, 13 insertions(+), 2 deletions(-)
38
39diff --git a/hwdb.d/60-keyboard.hwdb b/hwdb.d/60-keyboard.hwdb
40index 665721f..ea0ca56 100644
41--- a/hwdb.d/60-keyboard.hwdb
42+++ b/hwdb.d/60-keyboard.hwdb
43@@ -502,8 +502,19 @@ evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pn*:*
44 KEYBOARD_KEY_8=unknown # Use hp-wireless instead
45
46 # The allowlist to unblock intel-hid on HP machines.
47-evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPZBookFury16inchG9MobileWorkstationPC:pvr*
48-evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPZBookStudio16.0InchMobileWorkstationPC:pvr*
49+evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPZBookFury16G9MobileWorkstationPC:pvr*
50+evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPZBookStudio16inchG9MobileWorkstationPC:pvr*
51+evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPProBook44014inchG9NotebookPC:pvr*
52+evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPProBook45015.6inchG9NotebookPC:pvr*
53+evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPElitex36083013inchG92-in-1NotebookPC:pvr*
54+evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPEliteBook104014inchG9NotebookPC:pvr*
55+evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPEliteBook84014inchG9NotebookPC:pvr*
56+evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPElitex360104014inchG92-in-1NotebookPC:pvr*
57+evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPEliteBook86016inchG9NotebookPC:pvr*
58+evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPEliteBook64014inchG9NotebookPC:pvr*
59+evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPEliteBook65015.6inchG9NotebookPC:pvr*
60+evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPEliteBook83013inchG9NotebookPC:pvr*
61+evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPEliteBook63013inchG9NotebookPC:pvr*
62 KEYBOARD_KEY_8=wlan
63
64 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pn*:*
diff --git a/debian/patches/series b/debian/patches/series
index 11563f4..c41d5ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -77,3 +77,4 @@ CVE-2021-3997-3.patch
77lp1955997-add-a-allowlist-to-unblock-intel-hid-on-HP-mach.patch77lp1955997-add-a-allowlist-to-unblock-intel-hid-on-HP-mach.patch
78pid1-set-SYSTEMD_NSS_DYNAMIC_BYPASS-1-env-var-for-dbus-da.patch78pid1-set-SYSTEMD_NSS_DYNAMIC_BYPASS-1-env-var-for-dbus-da.patch
79debian/UBUNTU-Don-t-override-Ubuntu-s-default-sysctl-values-LP-1962038.patch79debian/UBUNTU-Don-t-override-Ubuntu-s-default-sysctl-values-LP-1962038.patch
80lp1966179-add-more-hp-dmi-to-unblock-intel-hid-event.patch

Subscribers

People subscribed via source and target branches