Skip to content
Snippets Groups Projects

install: explicitly install osk-sdl when needed

Merged Imported Administrator requested to merge install_osk-sdl into master
All threads resolved!

This adds osk-sdl to the rootfs when --fde is set, or when building a rootfs for the ondev installer. Ideally the ondev installer would selectively install osk-sdl if the user opted for fde at runtime, but I haven't found a straight forward way to enable that yet, and this behavior here is no different than the current behavior (where osk-sdl is always installed in the rootfs by way of depends= in pmos-mkinitfs).

For images that are built without --fde, osk-sdl won't be installed at all in the rootfs, once the dependency is dropped from pmos-mkinitfs in https://gitlab.com/postmarketOS/pmaports/-/merge_requests/2242

Edited by Administrator

Merge request reports

Checking pipeline status.

Approved by

Merged by AdministratorAdministrator 3 years ago (Jun 26, 2021 6:13am UTC)

Merge details

  • Changes merged into master with 31e36e19.
  • Deleted the source branch.

Pipeline #190467 passed

Pipeline passed for 31e36e19 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
  • Author Owner

    Great work! Please fix the pmaports.cfg guard and rebase on master so it passes CI (thanks for fixing the shellcheck thing). Other than that: LGTM!

    Ideally the ondev installer would selectively install osk-sdl if the user opted for fde at runtime, but I haven't found a straight forward way to enable that yet

    This is what I came up with, let's do it after the current pmaports and pmbootstrap MRs are merged (as they are useful in current state already):

    https://gitlab.com/postmarketOS/postmarketos-ondev/-/issues/49

    By Oliver Smith on 2021-06-19T13:29:09

  • Administrator mentioned in commit pmaports@1d78b5cb · Imported

    mentioned in commit pmaports@1d78b5cb

    By clayton craft on 2021-06-25T16:11:25

  • Administrator resolved all threads · Imported

    resolved all threads

    By clayton craft on 2021-06-25T16:44:12

  • Administrator added 6 commits · Imported

    added 6 commits

    Compare with previous version

    By clayton craft on 2021-06-25T19:28:40

  • Administrator merged · Imported

    merged

  • Administrator mentioned in commit pmaports@0f1c765e · Imported

    mentioned in commit pmaports@0f1c765e

    By clayton craft on 2021-06-26T23:33:52

  • Please register or sign in to reply
    Loading