Skip to content
Snippets Groups Projects

pmb/chroot/initfs: change invocation to support the new mkinitfs

Merged Imported pmb/chroot/initfs: change invocation to support the new mkinitfs
new_mkinitfs into master
All threads resolved!
Merged Imported Administrator requested to merge new_mkinitfs into master
All threads resolved!

This changes pmb to support the new mkinitfs here: https://gitlab.com/postmarketOS/pmaports/-/merge_requests/2426

Edited by Administrator

Merge request reports

Checking pipeline status.

Approved by
Administrator

Merged by AdministratorAdministrator 3 years ago (Sep 3, 2021 5:26pm UTC)

Merge details

  • Changes merged into master with 45ce639a.
  • Did not delete the source branch.

Pipeline #187757 passed

Stage: test

Pipeline passed for 45ce639a on master

Deployed to dep‎loy‎ 5 months ago

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 3 commits · Imported

    added 3 commits

    • bb3719f7 - chroot/other/kernel_flavor_installed: support generic kernel name
    • e629da04 - pmb/*: use kernel_flavor_installed
    • e2aec1cd - TODO: pmb/config/flashers: use boot.img for flask_kernel image name

    Compare with previous version

    By clayton craft on 2021-08-19T07:52:18

  • Administrator
  • Administrator
  • Administrator
  • Administrator
  • Administrator
  • Administrator
  • Administrator
  • Administrator
  • Administrator
  • Administrator added 9 commits · Imported

    added 9 commits

    • e2aec1cd...468d3137 - 4 commits from branch master
    • 6db8f8dd - pmb/chroot/initfs: change invocation to support the new mkinitfs
    • adf8a763 - pmb/helpers/frontend: drop all --flavors args
    • 9a82170d - pmb/install: use kernel pkg for device when printing firewall info
    • 0a55aa02 - chroot/other/kernel_flavor_installed: support generic kernel name
    • 5dff6823 - pmb/config/flashers: use boot.img for flask_kernel image name

    Compare with previous version

    By clayton craft on 2021-08-24T21:42:54

    Toggle commit list
  • Administrator mentioned in commit postmarketos-android-recovery-installer@31473f90 · Imported

    mentioned in commit postmarketos-android-recovery-installer@31473f90

    By clayton craft on 2021-08-25T00:59:13

  • Administrator mentioned in merge request postmarketos-android-recovery-installer!10 (merged) · Imported

    mentioned in merge request postmarketos-android-recovery-installer!10 (merged)

    By clayton craft on 2021-08-25T00:59:46

  • Administrator mentioned in commit postmarketos-android-recovery-installer@fea3c98b · Imported

    mentioned in commit postmarketos-android-recovery-installer@fea3c98b

    By clayton craft on 2021-08-25T01:12:23

  • Administrator added 6 commits · Imported

    added 6 commits

    • 1616029a - pmb/chroot/initfs: change invocation to support the new mkinitfs
    • b3161ffc - pmb/helpers/frontend: drop all --flavors args
    • 7b136df6 - pmb/install: use kernel pkg for device when printing firewall info
    • f4a56b1d - chroot/other/kernel_flavor_installed: support generic kernel name
    • 035b31e8 - pmb/config/flashers: add support for single kernel 'flavor'
    • ca084761 - pmb/install/recovery: add support for single kernel 'flavor'

    Compare with previous version

    By clayton craft on 2021-08-25T02:10:34

    Toggle commit list
  • Administrator marked this merge request as ready · Imported

    marked this merge request as ready

    By clayton craft on 2021-08-25T16:09:00

  • Administrator
  • Administrator
  • Administrator added 1 commit · Imported

    added 1 commit

    • e614020b - pmb/export/symlinks: add support for a single 'flavor'

    Compare with previous version

    By clayton craft on 2021-08-29T19:51:27

  • Administrator
  • Administrator
  • Administrator
    Administrator @root · Imported
    Author Owner

    Thanks for all the work on this, looks pretty good now! Just some minor things.

    By Oliver Smith on 2021-08-29T21:37:48

  • Administrator added 4 commits · Imported

    added 4 commits

    • c6e3f369 - chroot/other/kernel_flavor_installed: support generic kernel name
    • 7be75b53 - pmb/config/flashers: add support for single kernel 'flavor'
    • e6930a82 - pmb/install/recovery: add support for single kernel 'flavor'
    • 9da0a5c9 - pmb/export/symlinks: add support for a single 'flavor'

    Compare with previous version

    By clayton craft on 2021-08-30T03:22:24

    Toggle commit list
  • Administrator marked this merge request as draft · Imported

    marked this merge request as draft

    By clayton craft on 2021-09-01T17:12:23

    • Administrator
      Administrator @root · Imported
      Author Owner
      Resolved by Administrator

      marking as 'draft' since there's some breakage in qemu I need to debug/fix, and don't want this to get merged before that is done.

      By clayton craft on 2021-09-01T17:13:14

  • Administrator added 10 commits · Imported

    added 10 commits

    • 9da0a5c9...9ae2eef0 - 2 commits from branch master
    • f46533a2 - pmb/chroot/initfs: change invocation to support the new mkinitfs
    • e3c4f103 - pmb/helpers/frontend: drop all --flavors args
    • 4a10bbe6 - pmb/install: use kernel pkg for device when printing firewall info
    • df7be7da - chroot/other/kernel_flavor_installed: support generic kernel name
    • b8628764 - pmb/config/flashers: add support for single kernel 'flavor'
    • 04809a99 - pmb/install/recovery: add support for single kernel 'flavor'
    • 2a5bd848 - pmb/export/symlinks: add support for a single 'flavor'
    • 5dedf111 - pmb/qemu: add support for single kernel 'flavor'

    Compare with previous version

    By clayton craft on 2021-09-01T18:14:03

    Toggle commit list
  • Administrator marked this merge request as ready · Imported

    marked this merge request as ready

    By clayton craft on 2021-09-01T18:14:44

  • Administrator
  • Administrator
    Administrator @root · Imported
    Author Owner

    I've read this MR, the pmaports MR, the source of boot-deploy and the new postmarketos-mkinitfs. Overall everything looks reasonable, noticed some things but they don't need to block the release; I'll make separate issues for them.

    Some additional testing I did:

    • ran pmbootstrap install on the v21.06 branch (where we will not roll out the new mkinitfs), to make sure that the backwards compat code paths in pmbootstrap work as expected:
      • pine64-pinephone -> install runs through, files in /boot look just like on current edge, looks good
      • oneplus-enchilada -> install runs through
      • nokia-n900 -> install runs through
    • installed this MR + the pmaports MR on my pinephone
      • building linux-postmarketos-allwinner device-pine64-allwinner postmarketos-mkinitfs
        • kernel is still building, so didn't test this yet
        • UPDATE: now tested too!
      • host built packages as own repo
      • install everything, reboot

    I think this pmbootstrap MR is ready to go, except for two details. But they don't need another review round, I think you can merge it after these are resolved. If somebody else could review this it would be nice, but also it has been open for 3 weeks now and seen a reasonable amount of reviewing and testing.

    As discussed, let's merge tomorrow around 17:00 UTC (10 am PDT, 19:00 CEST) :)

    TODO before merge:

    • announce this mkinitfs change in an edge blog post (I suggest doing this ASAP, so people can be aware a bit ahead of time)
    • suffix variable (see other comment)
    • there's still "supported_new_mkinitfs" in the commit diff and commit message of the patch pmb/chroot/initfs: change invocation to support the new mkinitfs, it should be "supported_mkinitfs_without_flavors" as it's now everywhere else.

    Now regarding the rollout plan: I thought about compatibility of pmaports.git once pmaports!2426 is merged with the latest released pmbootstrap version, and concluded that it will not be possible. All the device and kernel packages now have the suffix dropped, so if using pmaports!2426, we also must use this pmbootstrap MR. This means, we need a pmbootstrap MR and the pmaports MR must depend on it.

    Roll out plan:

    • take care of TODOs above
    • merge pmbootstrap MR (let's do this tomorrow as discussed)
    • create pmbootstrap release (note that currently only I and Martijn can update the pypi tarball; if it's not on pypi then wait here until it is and don't merge the pmaports MR yet)
    • pmaports MR: resolve open threads (bump pkgrel etc.)
    • pmaports MR: increase pmbootstrap_min_version in pmaports.cfg to the newly released version
    • pmaports MR: add MR ID to commit msgs and merge
    • document the new variable in pmaports.cfg
    • (fix stuff that breaks)

    By Oliver Smith on 2021-09-03T18:08:44

    Edited by Administrator
  • Administrator added 8 commits · Imported

    added 8 commits

    • 25d5af20 - pmb/chroot/initfs: change invocation to support the new mkinitfs
    • de48a70c - pmb/helpers/frontend: drop all --flavors args
    • dcdaaa2f - pmb/install: use kernel pkg for device when printing firewall info
    • 1bc2c0cb - chroot/other/kernel_flavor_installed: support generic kernel name
    • 6f329094 - pmb/config/flashers: add support for single kernel 'flavor'
    • ec28dc09 - pmb/install/recovery: add support for single kernel 'flavor'
    • 67b8907d - pmb/export/symlinks: add support for a single 'flavor'
    • fad1eb93 - pmb/qemu: add support for single kernel 'flavor'

    Compare with previous version

    By clayton craft on 2021-09-03T01:18:54

    Toggle commit list
  • Administrator resolved all threads · Imported

    resolved all threads

    By Oliver Smith on 2021-09-03T17:13:10

  • Administrator resolved all threads · Imported

    resolved all threads

    By clayton craft on 2021-09-03T17:13:26

  • Administrator added 8 commits · Imported

    added 8 commits

    • ca7ac4c7 - pmb/chroot/initfs: change invocation to support the new mkinitfs (MR 2093)
    • 1d503073 - pmb/helpers/frontend: drop all --flavors args (MR 2093)
    • 184ac91e - pmb/install: use kernel pkg for device when printing firewall info (MR 2093)
    • 09794ef8 - chroot/other/kernel_flavor_installed: support generic kernel name (MR 2093)
    • 05c9fb78 - pmb/config/flashers: add support for single kernel 'flavor' (MR 2093)
    • 91bb6827 - pmb/install/recovery: add support for single kernel 'flavor' (MR 2093)
    • 453ce35b - pmb/export/symlinks: add support for a single 'flavor' (MR 2093)
    • 45ce639a - pmb/qemu: add support for single kernel 'flavor' (MR 2093)

    Compare with previous version

    By Oliver Smith on 2021-09-03T17:15:14

    Toggle commit list
  • Administrator approved this merge request · Imported

    approved this merge request

    By Oliver Smith on 2021-09-03T17:26:43

  • Administrator merged · Imported

    merged

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

    mentioned in merge request !2112 (merged)

    By clayton craft on 2021-09-13T15:32:49

  • Administrator mentioned in commit postmarketos-android-recovery-installer@3af18398 · Imported

    mentioned in commit postmarketos-android-recovery-installer@3af18398

    By clayton craft on 2021-10-01T20:23:32

    • Please register or sign in to reply