PC enablement tools

Merge ~fourdollars/pc-enablement/+git/oem-scripts:master into ~oem-solutions-engineers/pc-enablement/+git/oem-scripts:master

  1. Git
  2. lp:~fourdollars/pc-enablement/+git/oem-scripts
  3. master
  4. Merge into master
Proposed by Shih-Yuan Lee
Status: Merged
Approved by: Shih-Yuan Lee
Approved revision: d9b95635a3a44572736338e5937ebcb2cd0f7e54
Merged at revision: 80293e3eb6521ae3148e2938ff4b69f202a739b9
Proposed branch: ~fourdollars/pc-enablement/+git/oem-scripts:master
Merge into: ~oem-solutions-engineers/pc-enablement/+git/oem-scripts:master
Diff against target: 123 lines (+31/-6)
8 files modified
debian/changelog (+15/-0)
debian/tests/control (+3/-1)
debian/tests/pkg-stella-meta (+2/-2)
debian/tests/recovery-from-iso.sh (+3/-0)
debian/tests/review-merge-proposal (+3/-0)
mir-bug (+2/-2)
pkg-oem-meta (+1/-1)
setup.py (+2/-0)
Reviewer Review Type Date Requested Status
Alex Tu (community) Approve
Review via email: mp+400893@code.launchpad.net

Description of the change

Two commits are related to the i2c SSID fixes for Dell and HP.

mir-bug: Fix the SSID parsing issue for the i2c device.
debian/tests/pkg-stella-meta, pkg-oem-meta: Make the modalias pattern to match the subsystem ID of the i2c device.

Others are fixes for the installation and tests of new tools.

debian/tests/control, debian/tests/recovery-from-iso.sh, setup.py: Add the test and fix the installation for recovery-from-iso.sh.
debian/tests/control, debian/tests/review-merge-proposal, setup.py: Add the test and fix the installation for review-merge-proposal.

To post a comment you must log in.
Revision history for this message
Shih-Yuan Lee (fourdollars) wrote :

[BOT]
$ cat oem-scripts-0.82-d9b9563-in-docker-focal-summary.log
autopkgtest-collect-credentials PASS
autopkgtest-oem-scripts-auto PASS
pkg-somerville-meta PASS
pkg-stella-meta PASS
pkg-sutton-meta PASS
bug-bind PASS
get-private-ppa PASS
jq-lp PASS
launchpad-api PASS
lp-bug PASS
mir-bug PASS
oem-meta-packages PASS
pkg-list PASS
review-merge-proposal PASS
run-autopkgtest PASS
setup-apt-dir PASS
git-url-insteadof-setting PASS
recovery-from-iso.sh PASS
mir-bug-verification PASS
https://paste.ubuntu.com/p/zYs6sNx8J3/ oem-scripts-0.82-d9b9563-in-docker-focal-complete.log

Revision history for this message
jeremyszu (os369510) wrote :

Asked by AlexT

>>btw, I would like to past the confirmation from HP on that MP as a record...... @jeremysu ^ could you have a review on it and past the confirmation from HP as a record?

https://drive.google.com/file/d/12ggYZZMe0TzwXmplHcRPyOnqpNtFIKkF/view?usp=sharing

Revision history for this message
Alex Tu (alextu) wrote :

the part HP confirmed on the mail attached by Jeremyszu.

mail title: [Stella][HP CMIT] SSID for Ionian13, Ionian14 and Ionian15

Burrell, Jeff William (Z Desktop Workstations R&D - Linux team) <email address hidden> Thu, Apr 1, 2021 at 1:54 AM
To: Chih-Hsyuan Ho <email address hidden>, Alex Tu <email address hidden>
Cc: "Lopez, Jorge A (Thin Clients)" <email address hidden>, Jeremy Szu <email address hidden>, "Hamaguchi, Jun" <email address hidden>, Stella
<email address hidden>, Stephane Verdy <email address hidden>, "Verma, Jatin" <email address hidden>, Rex Tsai <email address hidden>, "Van Farowe,
Paul Robert" <email address hidden>
Chih,
I discussed this with the dtWS BIOS lead and he has no concerns over your approach.
Jeff

Revision history for this message
Alex Tu (alextu) wrote :

LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 199fa08..4f5044c 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,18 @@
6+oem-scripts (0.82) UNRELEASED; urgency=medium
7+
8+ * debian/tests/control,
9+ debian/tests/review-merge-proposal,
10+ setup.py: Add the test and fix the installation for review-merge-proposal.
11+ * debian/tests/pkg-stella-meta,
12+ pkg-oem-meta: Make the modalias pattern to match the subsystem ID of the
13+ i2c device.
14+ * debian/tests/control,
15+ debian/tests/recovery-from-iso.sh,
16+ setup.py: Add the test and fix the installation for recovery-from-iso.sh.
17+ * mir-bug: Fix the SSID parsing issue for the i2c device.
18+
19+ -- Shih-Yuan Lee (FourDollars) <sylee@canonical.com> Fri, 09 Apr 2021 14:12:57 +0800
20+
21 oem-scripts (0.81) focal; urgency=medium
22
23 * debian/tests/pkg-somerville-meta,
24diff --git a/debian/tests/control b/debian/tests/control
25index ac14090..0b6b61d 100644
26--- a/debian/tests/control
27+++ b/debian/tests/control
28@@ -18,12 +18,14 @@ Tests:
29 mir-bug,
30 oem-meta-packages,
31 pkg-list,
32+ review-merge-proposal,
33 run-autopkgtest,
34 setup-apt-dir
35 Depends: @
36
37 Tests:
38- git-url-insteadof-setting
39+ git-url-insteadof-setting,
40+ recovery-from-iso.sh
41 Depends: @
42 Restrictions: allow-stderr
43
44diff --git a/debian/tests/pkg-stella-meta b/debian/tests/pkg-stella-meta
45index 55583ee..1d26c5c 100644
46--- a/debian/tests/pkg-stella-meta
47+++ b/debian/tests/pkg-stella-meta
48@@ -32,7 +32,7 @@ grep "^apt-get autoremove --purge --yes oem-stella.cmit-ivysaur-meta$" debian/te
49
50 grep "Upstream-Name: oem-stella.cmit-ivysaur-meta" debian/copyright
51
52-grep "alias pci:\*sv0000103Csd00008750\* meta oem-stella.cmit-ivysaur-meta" debian/modaliases
53+grep "alias pci:\*sv0000103Csd00008750bc0Csc05\* meta oem-stella.cmit-ivysaur-meta" debian/modaliases
54
55 git checkout cmit.ivysaur-focal-oem
56
57@@ -55,4 +55,4 @@ grep "^apt-get autoremove --purge --yes oem-stella.cmit-ivysaur-meta$" debian/te
58
59 grep "Upstream-Name: oem-stella.cmit-ivysaur-meta" debian/copyright
60
61-grep "alias pci:\*sv0000103Csd00008750\* meta oem-stella.cmit-ivysaur-meta" debian/modaliases
62+grep "alias pci:\*sv0000103Csd00008750bc0Csc05\* meta oem-stella.cmit-ivysaur-meta" debian/modaliases
63diff --git a/debian/tests/recovery-from-iso.sh b/debian/tests/recovery-from-iso.sh
64new file mode 100644
65index 0000000..376f242
66--- /dev/null
67+++ b/debian/tests/recovery-from-iso.sh
68@@ -0,0 +1,3 @@
69+#!/bin/sh
70+
71+recovery-from-iso.sh --help || true
72diff --git a/debian/tests/review-merge-proposal b/debian/tests/review-merge-proposal
73new file mode 100644
74index 0000000..3e0cdaf
75--- /dev/null
76+++ b/debian/tests/review-merge-proposal
77@@ -0,0 +1,3 @@
78+#!/bin/sh
79+
80+review-merge-proposal --help
81diff --git a/mir-bug b/mir-bug
82index f53f1d1..dee3a25 100755
83--- a/mir-bug
84+++ b/mir-bug
85@@ -683,9 +683,9 @@ def _get_items_from_git(project: str, branch: str, pkg_name: str) -> tuple:
86 git_dir = os.path.join(tmpdir, pkg_name)
87
88 if project == 'somerville':
89- prog = re.compile(r"alias pci:\*sv00001028sd0000(\w+)\* meta (.*)")
90+ prog = re.compile(r"alias pci:\*sv00001028sd0000([0-9A-F]{4})[^ ]* meta (.*)")
91 elif project == 'stella':
92- prog = re.compile(r"alias pci:\*sv0000103Csd0000(\w+)\* meta (.*)")
93+ prog = re.compile(r"alias pci:\*sv0000103Csd0000([0-9A-F]{4})[^ ]* meta (.*)")
94 else:
95 prog = re.compile(r"alias dmi:\*bvn([0-9a-zA-Z]+):bvr([0-9a-zA-Z]{3})\* meta (.*)")
96
97diff --git a/pkg-oem-meta b/pkg-oem-meta
98index 3eeb1e7..64b1421 100755
99--- a/pkg-oem-meta
100+++ b/pkg-oem-meta
101@@ -347,7 +347,7 @@ License: GPL-3
102 .format(bios_id.upper(), meta))
103 elif 'sd_id' in vars(args).keys():
104 for sd_id in args.sd_id:
105- f.write("alias pci:*sv0000103Csd0000{0}* meta {1}\n"
106+ f.write("alias pci:*sv0000103Csd0000{0}bc0Csc05* meta {1}\n"
107 .format(sd_id.upper(), meta))
108 elif 'bios_ver' in vars(args).keys():
109 for bios_ver in args.bios_ver:
110diff --git a/setup.py b/setup.py
111index 7984690..e93bd77 100644
112--- a/setup.py
113+++ b/setup.py
114@@ -48,7 +48,9 @@ Also there is a meta package oem-dev-tools that installs all scripts''',
115 'oem-meta-packages',
116 'pkg-list',
117 'pkg-oem-meta',
118+ 'recovery-from-iso.sh',
119 'rename-everything.py',
120+ 'review-merge-proposal',
121 'run-autopkgtest',
122 'setup-apt-dir.sh',
123 'setup4test.sh',

Subscribers

People subscribed via source and target branches