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

[Shih-Yuan Lee]

[jeremyszu (os369510)]

I think it's because we are requiring to do the oem kernel retirement.
There are some codes related to "20.04" need to be adjusted to "22.04"+ but it doesn't matter to this MP.

The MP looks good to me but the other lines:

e.g.

        lines[idx] = lines[idx].replace(
            ", linux-oem-20.04b | linux-oem-20.04,", f", {args.kernel},"
        )

need to consider linux-oem-20.04c, linux-oem-20.04d?

If CI passed, then I think we are good to go.

review: Approve

[OEM Taipei Bot (oem-taipei-bot)]

[autopkgtest]
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
pkg-list PASS
review-merge-proposal PASS
run-autopkgtest PASS
setup-apt-dir PASS
bootstrap-meta PASS
mir-bug PASS
oem-meta-packages SKIP exit status 77 and marked as skippable
git-url-insteadof-setting PASS
lp-dl-attm PASS
recovery-from-iso.sh PASS

https://oem-share.canonical.com/partners/lyoncore/share/artifacts/oem-scripts/oem-scripts-1.45-f793292-in-linux-container-jammy

[OEM Taipei Bot (oem-taipei-bot)]

[autopkgtest]
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
pkg-list PASS
review-merge-proposal PASS
run-autopkgtest PASS
setup-apt-dir PASS
bootstrap-meta PASS
mir-bug PASS
oem-meta-packages SKIP exit status 77 and marked as skippable
git-url-insteadof-setting PASS
lp-dl-attm PASS
recovery-from-iso.sh PASS

https://oem-share.canonical.com/partners/lyoncore/share/artifacts/oem-scripts/oem-scripts-1.47-a0c8be9-in-linux-container-jammy

diff --git a/oem-meta-packages b/oem-meta-packages
index 2b2e999..59594ba 100755
--- a/oem-meta-packages
+++ b/oem-meta-packages
@@ -501,10 +501,7 @@ def deal_with_kernel_depends(pkg_name, branch, git_dir) -> bool:
             )
             if prev != lines[idx]:
                 changed = True
-    elif (
-        args.kernel.startswith("linux-oem-20.04")
-        and f", {args.kernel}," not in lines[idx]
-    ):
+    elif f", {args.kernel}," not in lines[idx]:
         lines[idx] = lines[idx].replace(
             ", linux-oem-20.04b | linux-oem-20.04,", f", {args.kernel},"
         )
@@ -553,7 +550,7 @@ def deal_with_debian_modaliases(git_dir: str) -> bool:
 
     changed = False
     for i, modalias in enumerate(modaliases):
-        if 'bc0Csc05*' not in modalias:
+        if "bc0Csc05*" not in modalias:
             changed = True
             modaliases[i] = modalias.replace("* meta oem-", "bc0Csc05* meta oem-")
 
@@ -1829,7 +1826,7 @@ 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):
+        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")