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

[Shih-Yuan Lee]

[Shih-Yuan Lee (fourdollars)]

$ ./oem-meta-packages --dry-run update --meta oem-somerville-three-eyed-raven-meta
<INFO> Using oem-scripts login
<INFO> Loading KWallet
<INFO> Loading SecretService
<INFO> Loading Windows
<INFO> Loading chainer
<INFO> Loading macOS
<INFO> Checking oem-somerville-three-eyed-raven-meta...
<INFO> OemFromGit (20.04ubuntu4, default, linux-generic-hwe-20.04, , )
<INFO> OemFromPPA (20.04ubuntu4, default, linux-generic-hwe-20.04, ppa:oem-archive/somerville-three-eyed-raven, )
<INFO> OemFromDevelArchive (20.04ubuntu4, default, linux-generic-hwe-20.04, cesg:somerville-three-eyed-raven-focal-devel, )
<INFO> OemFromStagingArchive (20.04ubuntu4, default, linux-generic-hwe-20.04, cesg:somerville-three-eyed-raven-focal-staging, )
<INFO> OemFromPublicArchive (20.04ubuntu4, default, linux-generic-hwe-20.04, oem:somerville-three-eyed-raven, )
<INFO> BootstrapFromGit (20.04~ubuntu2, default, , , )
<INFO> BootstrapFromPPA (, , , ppa:canonical-oem-metapackage-uploaders/oem-metapackage-staging, )
<INFO> BootstrapFromProposedArchive (, , , ubuntu:focal-proposed, )
<INFO> BootstrapFromUbuntuArchive (20.04~ubuntu2, default, , ubuntu:focal|focal-updates, )
<INFO> Checking oem-somerville-three-eyed-raven-meta bootstrap=BootstrapGroup(git=PkgData(version='20.04~ubuntu2', archive='', kernel_flavour='default', kernel_meta='', fingerprint='', market_name=''), ppa=PkgData(version='', archive='ppa:canonical-oem-metapackage-uploaders/oem-metapackage-staging', kernel_flavour='', kernel_meta='', fingerprint='EA7BFBE3B33B9D51D225430EC83677AEDFC29884', market_name=''), proposed=PkgData(version='', archive='ubuntu:focal-proposed', kernel_flavour='', kernel_meta='', fingerprint='', market_name=''), ubuntu=PkgData(version='20.04~ubuntu2', archive='ubuntu:focal|focal-updates', kernel_flavour='default', kernel_meta='', fingerprint='', market_name='')) oem=OemGroup(git=PkgData(version='20.04ubuntu4', archive='', kernel_flavour='default', kernel_meta='linux-generic-hwe-20.04', fingerprint='', market_name=''), ppa=PkgData(version='20.04ubuntu4', archive='ppa:oem-archive/somerville-three-eyed-raven', kernel_flavour='default', kernel_meta='linux-generic-hwe-20.04', fingerprint='B02DB471D6E2ADFF98B0CBA5D4EFDDE038AD84EA', market_name=''), devel=PkgData(version='20.04ubuntu4', archive='cesg:somerville-three-eyed-raven-focal-devel', kernel_flavour='default', kernel_meta='linux-generic-hwe-20.04', fingerprint='A9DD3581844D8C9463652FA354F1860295829CE3', market_name=''), staging=PkgData(version='20.04ubuntu4', archive='cesg:somerville-three-eyed-raven-focal-staging', kernel_flavour='default', kernel_meta='linux-generic-hwe-20.04', fingerprint='A9DD3581844D8C9463652FA354F1860295829CE3', market_name=''), public=PkgData(version='20.04ubuntu4', archive='oem:somerville-three-eyed-raven', kernel_flavour='default', kernel_meta='linux-generic-hwe-20.04', fingerprint='59AC787C2A8C78BA5ECA0B2ED4D1EAED36962F69', market_name='')) old_desc='' new_desc=''...
<INFO> gbp:info: Tagging Debian package 20.04ubuntu5 as three-eyed-raven-focal-oem_20.04ubuntu5 in git
<INFO> three-eyed-raven-focal-oem_20.04ubuntu5
<WARNING> (oem-somerville-three-eyed-raven-meta:three-eyed-raven-focal-oem) $ git show
commit cd61b78ea90...

[Shih-Yuan Lee (fourdollars)]

[BOT]
$ cat oem-scripts-1.19-883323c-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
bootstrap-meta PASS
bug-bind PASS
get-private-ppa PASS
jq-lp PASS
launchpad-api PASS
lp-bug PASS
oem-meta-packages PASS
pkg-list PASS
review-merge-proposal PASS
run-autopkgtest PASS
setup-apt-dir PASS
mir-bug SKIP exit status 77 and marked as skippable
git-url-insteadof-setting PASS
lp-dl-attm PASS
recovery-from-iso.sh PASS
mir-bug-verification PASS
https://paste.ubuntu.com/p/Nt7TXsbKtF/ oem-scripts-1.19-883323c-in-docker-focal-complete.log

[jeremyszu (os369510)]

lgtm

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 10a2e0a..2c76b84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+oem-scripts (1.19) UNRELEASED; urgency=medium
+
+  * oem-meta-packages: Make it automatically correct the debian/modaliases for
+    SMBus/i2C SSIDs.
+
+ -- Shih-Yuan Lee (FourDollars) <[e-mail]>  Mon, 08 Nov 2021 22:38:24 +0800
+
 oem-scripts (1.18) focal; urgency=medium
 
   * oem-meta-packages: Deal with the problem when there is only
diff --git a/oem-meta-packages b/oem-meta-packages
index 10b2c76..d1dd206 100755
--- a/oem-meta-packages
+++ b/oem-meta-packages
@@ -545,6 +545,25 @@ def deal_with_kernel_depends(pkg_name, branch, git_dir) -> bool:
     return changed
 
 
+def deal_with_debian_modaliases(git_dir: str) -> bool:
+    debian_modaliases = os.path.join(git_dir, "debian", "modaliases")
+
+    with open(debian_modaliases, "r") as f:
+        modaliases = f.readlines()
+
+    changed = False
+    for i, modalias in enumerate(modaliases):
+        if 'bc0Csc05*' not in modalias:
+            changed = True
+            modaliases[i] = modalias.replace("* meta oem-", "bc0Csc05* meta oem-")
+
+    if changed:
+        with open(debian_modaliases, "w") as f:
+            f.writelines(modaliases)
+
+    return changed
+
+
 def deal_with_debian_tests(
     pkg_name: str, git_dir: str, branch: str, bootstrap: bool
 ) -> bool:
@@ -1810,6 +1829,8 @@ def deal_with_meta_git(pkg_name: str, pkg_info: PkgInfo, bootstrap: bool) -> boo
                 messages.append("grub flavour")
             if deal_with_maintainer_scripts(pkg_name, branch, git_dir):
                 messages.append("maintainer scripts")
+        if project != 'sutton' and deal_with_debian_modaliases(git_dir):
+            messages.append("debian/modaliases")
         if deal_with_gbp_conf(git_dir, branch):
             messages.append("debian/gbp.conf")
         if deal_with_debian_tests(pkg_name, git_dir, branch, bootstrap):