Skip to content
Snippets Groups Projects

postmarketos-cros-common: replace postmarketos-cros-keymap with postmarketos-cros-keymap-openrc

Closed postmarketos-cros-common: replace postmarketos-cros-keymap with postmarketos-cros-keymap-openrc
WeirdTreeThing/pmaports:cros-keymap-fix into master
1 unresolved thread
Closed Brady Norander requested to merge WeirdTreeThing/pmaports:cros-keymap-fix into master
1 unresolved thread

Fixes being unable to build for any cros device after !5688 (merged) was merged.

Merge request reports

Merge request pipeline #209703 passed

Stage: lint
Stage: build

Merge request pipeline passed for 70d9bda0

Closed by Brady NoranderBrady Norander 5 months ago (Nov 6, 2024 10:05pm UTC)

Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
main/postmarketos-cros-common/APKBUILD
19 19 # be enough for getting it to work, but this way people will not be able to
20 20 # uninstall it when they don't want this. Thus, making this as a subpackage of
21 21 # "postmarketos-cros-common" and adding it to _pmb_recommends. Naming it
22 # "postmarketos-cros-keymap" instead of "$pkgname-keymap", so the name is easier to
22 # "postmarketos-cros-keymap-openrc" instead of "$pkgname-keymap", so the name is easier to
23 23 # remember.
24 _pmb_recommends="postmarketos-cros-keymap"
24 _pmb_recommends="postmarketos-cros-keymap-openrc"
  • Newbyte
    Newbyte @Newbyte ·
    Maintainer

    @craftyguy Not sure who to ping here, but you're doing a lot of systemd stuff :sweat_smile:. This looks like it'd be a problem if someone tries to install this package on a systemd installation, right? We don't want any -openrc packages then, and _pmb_recommends is installed unconditionally to my knowledge. However, I don't know any way of having a recommended package that only gets installed if OpenRC is chosen over systemd. Do you have any ideas?

    In general, it might be nice to have some way of saying that we want to install/depend on the appropriate service files for the chosen init system. Maybe we could solve it with metapackages or virtual packages or providers or whatever.

    Edited by Newbyte
  • Oliver Smith
    Oliver Smith @ollieparanoid ·
    Maintainer

    @WeirdTreeThing: thanks for the MR! Sorry, only saw this after making the same fix as part of !5767 (merged).

    @Newbyte: This could be solved with some install_if logic. But given that systemd is not merged into master yet and this breaks "pmbootstrap install" for all chromeos devices currently, let's merge this fix now (I guess Clayton is about to merge the fix in the other MR, along with another fix), and figure how to make this play nice with systemd afterwards.

  • Brady Norander
    Brady Norander @WeirdTreeThing ·
    Author Reporter

    It's fine, I'll just close this MR since the other one has been merged.

  • Clayton Craft
    Clayton Craft @craftyguy ·
    Maintainer

    @Newbyte @ollieparanoid IIUC this should do it? !5768 (merged)

  • Please register or sign in to reply
  • Brady Norander closed

    closed

  • Clayton Craft mentioned in merge request !5768 (merged)

    mentioned in merge request !5768 (merged)

    • Please register or sign in to reply