Skip to content
Snippets Groups Projects

xiaomi-laurel: new device (and sm6125 mainline kernel)

Merged Imported Administrator requested to merge laurel into master
1 unresolved thread

This merge request adds support for Xiaomi Mi A3 (codenamed laurel_sprout) and the sm6125-mainline kernel package. The name has been shortened to laurel to match the naming scheme used in the wiki, so packages will be named xiaomi-laurel, instead of xiaomi-laurel_sprout.

Edited by Administrator

Merge request reports

Checking pipeline status.

Approved by

Merged by AdministratorAdministrator 2 years ago (May 5, 2022 9:12am UTC)

Merge details

  • Changes merged into master with 22e6d12c.
  • Deleted the source branch.

Pipeline #196172 passed

Pipeline passed for 22e6d12c on master

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Administrator changed title from Draft: xiaomi-laurel: new device (and kernel) to Draft: xiaomi-laurel: new device (and sm6125 mainline kernel) · Imported

    changed title from Draft: xiaomi-laurel: new device (and kernel) to Draft: xiaomi-laurel: new device (and sm6125 mainline kernel)

    By Lux Aliaga on 2022-05-02T01:13:24

  • Administrator added 2 commits · Imported

    added 2 commits

    • 103c6ffd - xiaomi-laurel: new device (Xiaomi Mi A3)
    • e9616c03 - linux-postmarketos-qcom-sm6125: new aport

    Compare with previous version

    By Lux Aliaga on 2022-05-02T03:39:21

  • Administrator added 3 commits · Imported

    added 3 commits

    • a5b16897 - 1 commit from branch postmarketOS:master
    • cf06d3d7 - xiaomi-laurel: new device (Xiaomi Mi A3)
    • 2b6b1200 - linux-postmarketos-qcom-sm6125: new aport

    Compare with previous version

    By Lux Aliaga on 2022-05-02T03:39:34

  • Administrator resolved all threads · Imported

    resolved all threads

    By Newbyte on 2022-05-02T06:04:22

  • Administrator added 1 commit · Imported

    added 1 commit

    • a91fac48 - xiaomi-laurel: Fix codename under deviceinfo

    Compare with previous version

    By Lux Aliaga on 2022-05-02T12:54:35

  • Author Owner

    This latest commit was pushed from Termux, so I can't run pmbootstrap to fix kconfig. I'll do it back home on my laptop.

    By Lux Aliaga on 2022-05-02T12:57:15

  • Administrator added 1 commit · Imported

    added 1 commit

    • 05a81252 - xiaomi-laurel: Remove unused deviceinfo property

    Compare with previous version

    By Lux Aliaga on 2022-05-02T13:04:56

  • Administrator added 1 commit · Imported

    added 1 commit

    • 36187623 - xiaomi-laurel: Set pkgrel back to 0

    Compare with previous version

    By Lux Aliaga on 2022-05-02T13:10:58

  • Author Owner

    Ok, unfortunately GitLab archives seem to use commit hashes on the extracted folders when fetching from branches. So I'll just have to use the commit hashes themselves to update the latest changes. I'll probably move to using tags instead.

    By Lux Aliaga on 2022-05-04T14:04:23

    Edited by Administrator
  • Administrator added 2 commits · Imported

    added 2 commits

    • fbab78e7 - linux-postmarketos-qcom-sm6125: Fetch from commit instead of branch
    • 9669ade9 - linux-postmarketos-qcom-sm6125: Fix kernel config

    Compare with previous version

    By Lux Aliaga on 2022-05-04T03:09:41

  • Administrator added category::device label · Imported

    added category::device label

    • Author Owner

      Seems like 2 hours isn't enough time to build. Time to increase it to 3 I guess sigh

      By Lux Aliaga on 2022-05-05T11:56:13

      Edited by Ghost User
    • Author Owner

      This usually means that your kernel config contains too many unneeded options (enabled like other architectures besides qcom, or other gpu drivers except msm drm)

      By Alexey Min on 2022-05-05T12:02:46

      Edited by Ghost User
    • Author Owner

      Might later look into that.

      By Lux Aliaga on 2022-05-05T12:02:29

    • Please register or sign in to reply
  • Author Owner

    Ok. CI now works! I'll rebase and it should be pretty much done.

    By Lux Aliaga on 2022-05-04T18:42:26

  • Administrator added 2 commits · Imported

    added 2 commits

    • 31b6d22e - xiaomi-laurel: new device (Xiaomi Mi A3)
    • 259ba65d - linux-postmarketos-qcom-sm6125: new aport

    Compare with previous version

    By Lux Aliaga on 2022-05-04T18:51:21

  • Administrator added 5 commits · Imported

    added 5 commits

    Compare with previous version

    By Lux Aliaga on 2022-05-04T18:51:56

  • Administrator marked this merge request as ready · Imported

    marked this merge request as ready

    By Lux Aliaga on 2022-05-04T18:52:37

  • Author Owner

    We should be all set!

    By Lux Aliaga on 2022-05-04T18:52:57

  • Author Owner

    CI has finished successfully after rebasing! Ready to merge.

    By Lux Aliaga on 2022-05-04T21:47:43

  • Administrator
  • Administrator
  • Author Owner

    Thanks for the MR mint, super exciting to get new SoCs running mainline :P

    Approving on the assumption that my above comments are resolved before merging. Feel free to squash the second commit into the first so it's just "new device", but it's up to you.

    By Caleb Connolly on 2022-05-05T00:53:58

    Edited by Ghost User
  • Administrator approved this merge request · Imported

    approved this merge request

    By Caleb Connolly on 2022-05-04T23:21:11

  • Administrator added 2 commits · Imported

    added 2 commits

    • ea68d1b7 - xiaomi-laurel: new device (Xiaomi Mi A3)
    • 7a3e5b33 - linux-postmarketos-qcom-sm6125: new aport

    Compare with previous version

    By Lux Aliaga on 2022-05-05T02:27:20

  • Administrator resolved all threads · Imported

    resolved all threads

    By Lux Aliaga on 2022-05-05T02:28:58

  • Author Owner

    Added the maintainer lines. I'm gonna keep them as separate commits because the sm6125 kernel may be used for other devices and doing so may make it easier for other maintainers to look at its history.

    By Lux Aliaga on 2022-05-05T03:20:57

    Edited by Administrator
  • Administrator approved this merge request · Imported

    approved this merge request

    By Newbyte on 2022-05-05T05:13:28

  • Administrator added 2 commits · Imported

    added 2 commits

    • f53c37a7 - xiaomi-laurel: new device (Xiaomi Mi A3) (MR 3105)
    • b2a95487 - linux-postmarketos-qcom-sm6125: new aport (MR 3105)

    Compare with previous version

    By Newbyte on 2022-05-05T05:14:30

  • Administrator enabled an automatic merge when the pipeline for b2a95487 succeeds · Imported

    enabled an automatic merge when the pipeline for b2a95487 succeeds

    By Newbyte on 2022-05-05T05:15:04

  • Administrator aborted the automatic merge because target branch was updated · Imported

    aborted the automatic merge because target branch was updated

    By Oliver Smith on 2022-05-05T06:29:31

  • Administrator added 5 commits · Imported

    added 5 commits

    • b2a95487...a7e672fc - 3 commits from branch postmarketOS:master
    • de6de0bd - xiaomi-laurel: new device (Xiaomi Mi A3) (MR 3105)
    • 22e6d12c - linux-postmarketos-qcom-sm6125: new aport (MR 3105)

    Compare with previous version

    By Newbyte on 2022-05-05T09:10:13

  • Administrator enabled an automatic merge when the pipeline for 22e6d12c succeeds · Imported

    enabled an automatic merge when the pipeline for 22e6d12c succeeds

    By Newbyte on 2022-05-05T09:10:25

  • Administrator merged · Imported

    merged

  • Please register or sign in to reply
    Loading