Skip to content
Snippets Groups Projects

v20.05: make pinephone work

Merged Imported v20.05: make pinephone work
v20.05_pinephone into v20.05
Merged Imported Administrator requested to merge v20.05_pinephone into v20.05

Cherry-pick all pinephone related commits from master to v20.05, to make the pinephone work with the v20.05 branch.

Like !1276 (closed), but with each commit cherry-picked and without the mesa changes (mesa changes should go in a separate MR).

Untested, we should test it before merging.

EDIT: when merging this, let's use mrhlpr to add (MR 1340) at the end. So the commits have two (MR... ) blocks at the end, this is fine, it indicates that it went through two MRs.

EDIT: also, when merging, add [ci:skip-build] to avoid another long build. Having it passing once in CI is enough, if only commit messages were changed afterwards.

Fixes #608 (closed)

Edited by Administrator

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Administrator added 1 commit · Imported

    added 1 commit

    • 58e3f4c9 - main/linux-postmarketos-allwiner: add CONFIG_SND_ALOOP=m to allow loopback dev (MR 1309)

    Compare with previous version

    By Oliver Smith on 2020-06-18T16:43:23

  • Administrator added 1 commit · Imported

    added 1 commit

    • 72666840 - main/linux-postmarketos-allwiner: add CONFIG_SND_ALOOP=m to allow loopback dev (MR 1309)

    Compare with previous version

    By Oliver Smith on 2020-06-18T16:53:21

  • Administrator changed the description · Imported

    changed the description

    By Oliver Smith on 2020-06-18T16:55:19

  • Administrator mentioned in merge request !1276 (closed) · Imported

    mentioned in merge request !1276 (closed)

    By Oliver Smith on 2020-06-18T17:11:03

  • Administrator changed the description · Imported

    changed the description

    By Oliver Smith on 2020-06-18T17:48:31

  • Administrator
    Administrator @root · Imported
    Author Owner

    Tested and working!

    I had to try to boot twice, before it actually started up (not sure if that was my fault) and the splash screens were not showing though. But definitively an improvement.

    pinephone-v20.05

    By Oliver Smith on 2020-06-18T18:15:35

  • Administrator
    Administrator @root · Imported
    Author Owner

    Did not finish in time, pushing again with [ci:skip-build].

    By Oliver Smith on 2020-06-18T19:59:40

  • Administrator added 8 commits · Imported

    added 8 commits

    • 2bc54f52 - pine-a64lts: add wifi and bluetooth firmware (MR 153) (MR 1340)
    • a962a319 - main/linux-postmarketos-allwinner: update to 5.6.0_git20200410 (MR 1143) (MR 1340)
    • a200499a - cross/arch-bin-masquerade, main/anbox-image, linux-*: use pmb:cross-native (MR 1169) (MR 1340)
    • 6db502e8 - main/linux-postmarketos-allwinner: cleanup modules (MR 1205) (MR 1340)
    • 66d39cb8 - main/linux-postmarketos-allwinner: add anbox support again (MR 1222) (MR 1340)
    • 5391bd11 - Support Anbox explicitly in some kernels: (MR 1232) (MR 1340)
    • a0f10fef - pine64-pinephone: unbreak audio (MR 1323) (MR 1340)
    • 98bdfd06 - main/linux-postmarketos-allwiner: add CONFIG_SND_ALOOP=m to allow loopback dev (MR 1309) (MR 1340)

    Compare with previous version

    By Oliver Smith on 2020-06-18T20:06:05

    Toggle commit list
  • Administrator added category::device + 1 deleted label · Imported

    added category::device + 1 deleted label

  • Administrator approved this merge request · Imported

    approved this merge request

    By Bart Ribbers on 2020-06-19T07:23:50

  • Administrator
    Administrator @root · Imported
    Author Owner

    With b5fcc3af, we have another MR from master cherry-picked to v20.05, that affects postmarketos-allwinner, and was done after the changes in this MR. This is suboptimal, let's try to avoid applying patches from master in different order on v20.05 in the future. But it's not critical, I'll rebase this MR now.

    And merge it. It has one approval, we really want to have the pinephone on v20.05 working soon, and it's just cherry-picking from master. I don't see a point in delaying this further.

    By Oliver Smith on 2020-06-20T09:57:05

  • Administrator added 17 commits · Imported

    added 17 commits

    • 98bdfd06...b88df955 - 9 commits from branch v20.05
    • 2e2a12d1 - pine-a64lts: add wifi and bluetooth firmware (MR 153) (MR 1340)
    • 3da51fe7 - main/linux-postmarketos-allwinner: update to 5.6.0_git20200410 (MR 1143) (MR 1340)
    • c80b2791 - cross/arch-bin-masquerade, main/anbox-image, linux-*: use pmb:cross-native (MR 1169) (MR 1340)
    • 3006ac5a - main/linux-postmarketos-allwinner: cleanup modules (MR 1205) (MR 1340)
    • b91f8171 - main/linux-postmarketos-allwinner: add anbox support again (MR 1222) (MR 1340)
    • b078a67f - Support Anbox explicitly in some kernels: (MR 1232) (MR 1340)
    • 72d1ecf8 - pine64-pinephone: unbreak audio (MR 1323) (MR 1340)
    • 48056a0e - main/linux-postmarketos-allwiner: add CONFIG_SND_ALOOP=m to allow loopback dev (MR 1309) (MR 1340)

    Compare with previous version

    By Oliver Smith on 2020-06-20T10:14:02

    Toggle commit list
  • Administrator changed the description · Imported

    changed the description

    By Oliver Smith on 2020-06-20T10:23:11

  • Administrator merged · Imported

    merged

    By Oliver Smith on 2020-06-20T10:24:54

  • Administrator mentioned in issue #608 (closed) · Imported

    mentioned in issue #608 (closed)

    By Oliver Smith on 2020-06-20T10:27:30

  • Administrator mentioned in merge request !1362 (merged) · Imported

    mentioned in merge request !1362 (merged)

    By Oliver Smith on 2020-07-02T22:31:07

Please register or sign in to reply