Commit Graph
14086 Commits
Author SHA1 Message Date
Aelin fddebb2279 systemd/systemd: fix the provider mess
This fixes two issues:

1. I was investigating why currently, pmbootstrap build --force
   libcamera would fail. It turns out that the problem was possible to
   reduce down to apk add eudev-dev resulting in installing eudev-dev
   instead of systemd-dev, even with the systemd repository enabled.
   This is because apk actually thinks it has a higher version:

name <eudev-dev> selected from selectable list
select_package: eudev-dev (requirers=1, autosel=1, iif=0, order_id=0x40005807)
  consider systemd-dev-261_rc4-r0 iif_triggered=0, tag_ok=1, selectable=1, available=1, flags=0x0, provider_priority=100, installed=0
   prefer existing package
    choose as new provider
  consider eudev-dev-3.2.14-r6 iif_triggered=0, tag_ok=1, selectable=1, available=1, flags=0x0, provider_priority=100, installed=0
    select latest by requested name (greater)
    choose as new provider
  consider libudev-zero-dev-1.0.4-r0 iif_triggered=0, tag_ok=1, selectable=1, available=1, flags=0x0, provider_priority=20, installed=0
    select latest by requested name (less)
selecting: eudev-dev-3.2.14-r6, available: 1
assign eudev-dev to eudev-dev-3.2.14-r6
disqualify_package: systemd-dev-261_rc4-r0 (conflicting provides)
disqualify_package: libudev-zero-dev-1.0.4-r0 (conflicting provides)

   And why is that? It's because we have two providers here: One is
   eudev-dev with a provider version of 3.2.14-r6, and the other is
   systemd-dev with a provider version that is empty. This then results
   in apk thinking the version number is greater, as seen above in the
   verbose output. An unversioned provides= for an exact package name
   match will never, ever, ever have any effect, even if the priority is
   set super high, because the version number comparison is before apk
   even starts looking at provider priorities.

   Therefore, we should not have unversioned provides for eudev,
   eudev-dev, eudev-libs and udev. Since those have fairly low version
   numbers, we can just provide them with systemd's version number and
   we'll be fine. This will now result in apk actually installing
   systemd-dev when eudev-dev is prompted for installation.

2. After fixing the aforementioned issue, I noticed that I couldn't
   build anything anymore. This is because my dependency tree would pull
   in systemd and systemd-udev - completely normal. However, both
   systemd and systemd-udev were providing eudev, and apk will refuse to
   install two packages that provide the same thing at the same time.
   The fix for this is to just not provide eudev in the top-level
   systemd package and rather let systemd-udev do that.

With this, I can now finally build libcamera again!

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8857>
2026-06-19 03:46:53 +02:00
Aelin 7bc5615daf device-lenovo-21bx: Fix typo in lts kernel description
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8856>
2026-06-18 19:04:35 +02:00
Ferass El Hafidi d4ead1f8f8 device-postmarketos-trailblazer: drop qcom-laptop kernel
It is apparently broken (according to Casey), and might be dropped from
pmaports anyway. Let's just drop it from trailblazer at this point.

Signed-off-by: Ferass El Hafidi <funderscore@postmarketos.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8826>
2026-06-18 15:49:42 +00:00
postmarketOS CI 93f70ea6c0 linux-next: upgrade to next-20260618 2026-06-18 15:38:50 +00:00
Aster Boese 9f4e4777a8 docs: reference Alpine Linux's CODINGSTYLE.md
Signed-off-by: Aster Boese <asterboese@mailbox.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8847>
2026-06-18 13:39:33 +00:00
Stefan Hansson f357e3e669 linux-postmarketos-qcom-sm7125: install modules to /usr
Signed-off-by: Stefan Hansson <newbyte@postmarketos.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8855>
2026-06-18 13:15:46 +00:00
binarycraft007 1aedb96c37 device-asus-s5507q: switch to mainline kernels
Adds support for the kernels in main (lts, mainline, stable) and removes
support for linux-postmarketos-qcom-laptop.

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8849>
2026-06-18 13:09:05 +00:00
Dang Huynh 167f59c830 linux-pine64-pinetab2: Upgrade to 7.0.12
Signed-off-by: Dang Huynh <dang.huynh@mainlining.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8840>
2026-06-18 10:42:52 +00:00
Clayton Craft 17214afd71 main/postmarketos-base-ui-plasma: add cups to pmb_recommends
Signed-off-by: Clayton Craft <craftyguy@postmarketos.org>

[ci:skip-vercheck]: pmb_recommends-only change

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8836>
2026-06-18 07:54:18 +00:00
Clayton Craft 64aa98a876 main/postmarketos-base-ui-gnome: add cups to pmb_recommends
Signed-off-by: Clayton Craft <craftyguy@postmarketos.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8836>
2026-06-18 07:54:18 +00:00
Clayton Craft d1d310a503 main/postmarketos-ui-cosmic: move install= from subpkg funcs
Signed-off-by: Clayton Craft <craftyguy@postmarketos.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8836>
2026-06-18 07:54:18 +00:00
Clayton Craft 81f3595800 main/postmarketos-ui-cosmic: add cups to pmb_recommends
Signed-off-by: Clayton Craft <craftyguy@postmarketos.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8836>
2026-06-18 07:54:18 +00:00
Dylan Van Assche ccd3a554a6 main/postmarketos-usb-moded: use service manager for unudhcpd
Also start set -e after config parameters are read. Fallbacks would trigger exit otherwise.

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8553>
2026-06-18 06:27:13 +00:00
Dylan Van Assche 9bccd6b5e9 systemd/postmarketos-base-systemd: enable unudhpcd service
Start unudhpcd on boot

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8553>
2026-06-18 06:27:13 +00:00
Dylan Van Assche 41732e213b main/postmarketos-initramfs: stop unudhcpd before switching rootfs
Rootfs will take over the managing of unudhcpd under the service manager,
stop unudhpcd to allow this and avoiding multiple instances.

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8553>
2026-06-18 06:27:13 +00:00
Dylan Van Assche 7a917eee3c main/postmarketos-usb-moded: handle initramfs situation
initramfs starts USB NCM gadget and unudhcpd for SSH login.
This requires special handling since unudhpcd is unmanaged by the
service manager until the userspace is started. Once entered in userspace,
the usb-moded-developer-mode needs to be activated which configures
NetworkManager and starts unudhcpd under the service manager.
This way, a full handover is possible and the gadgets can be properly
switched without any leftovers from the initramfs due to the unmanaged
situation.

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8553>
2026-06-18 06:27:13 +00:00
Dylan Van Assche b877e7943b main/postmarketos-usb-moded: support dynamic iface
Read iface name from gadget, including config name. Also check for errors

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8553>
2026-06-18 06:27:10 +00:00
Dylan Van Assche ba1fd6bf14 main/postmarketos-usb-moded: add OpenRC MTP mode
OpenRC also needs MTP mode for usb-signaller.

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8553>
2026-06-18 06:27:07 +00:00
Dylan Van Assche 9112523f0a systemd/postmarketos-base-systemd: swap usb-moded by usb-signaller
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8553>
2026-06-18 06:27:03 +00:00
Dylan Van Assche 9dcb48a08f main/postmarketos-usb-moded: switch to usb-signaller as default
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8553>
2026-06-18 06:27:00 +00:00
Dylan Van Assche f82661f261 main/postmarketos-usb-moded: add usb-moded-mtp-mode
MTP mode requires some time for the userspace daemon
to configure the FunctionFS gadget, wait until it is completed.

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8553>
2026-06-18 06:26:56 +00:00
Dylan Van Assche 7c4ebfcc91 main/postmarketos-usb-moded: clean up IP forwarding
NetworkManager doesn't clean up IP forwarding, do it in the tethering script.

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8553>
2026-06-18 06:26:53 +00:00
Bart Ribbers e2572a0dc9 systemd/kjournald: upgrade to 26.04.2
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8834>
2026-06-17 18:53:52 +00:00
Bart Ribbers fd34f8e28d systemd/plasma*: upgrade to 6.7.0
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8834>
2026-06-17 18:53:52 +00:00
Oliver Smith 0fe40dd597 main/postmarketos-release-upgrade: upgrade to 1.12.2
Signed-off-by: Oliver Smith <ollieparanoid@postmarketos.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8848>
2026-06-17 18:24:05 +00:00
Oliver Smith 9b29c2bc2c docs: stable-branches: backports may wait
Let's note that maintainers can choose to delay backports to give them
more testing time.

Signed-off-by: Oliver Smith <ollieparanoid@postmarketos.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8850>
2026-06-17 19:45:54 +02:00
Aster Boese ff88820b6a lenovo-21bx: add myself as co-maintainer and move reference to top
Signed-off-by: Aster Boese <asterboese@mailbox.org>

[ci:skip-vercheck]

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8844>
2026-06-17 18:32:37 +02:00
Aster Boese 283ff28eff device-lenovo-21bx: add boot-deploy hook to remove EFI capsules file
Persisted_Captules.sh is huge (70 MB) and can cause boot-deploy failures
when doing transactions that do large modifications to `/boot/`, such as
switching kernel packages. Persisted_Capsules.sh is recreated on reboot
and we do not use it for anything currently, so it is safe to remove in a
hook.

Signed-off-by: Aster Boese <asterboese@mailbox.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8368>
2026-06-17 15:01:58 +00:00
Aster Boese f0b0dff385 device-lenovo-21bx: switch to mainline kernels
Adds support for the kernels in main (lts, mainline, stable) and removes
support for linux-postmarketos-qcom-laptop after discussion with the
kernel's maintainers, as it is most likely going to be dropped, or at
least moved to testing.

Signed-off-by: Aster Boese <asterboese@mailbox.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8368>
2026-06-17 15:01:58 +00:00
Yu Watanabe 7eb30fa6f2 systemd/systemd: drop unnecessary conditionalization for $source
The upstream mkosi build does not fetch source files. Hence, it is not
necessary to exclude the tar ball from $source.

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8832>
2026-06-17 10:16:34 +00:00
Clayton Craft eb81a92aae systemd/systemd: upgrade to 261-rc4
Signed-off-by: Clayton Craft <craftyguy@postmarketos.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8832>
2026-06-17 10:16:34 +00:00
Oliver Smith aafecd66e7 device-apple-tonga: remove
Craftyguy: "we should really just drop apple-tonga, it's redundant with
'device-apple-mac-aarch64'"

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8683>
2026-06-17 09:07:14 +00:00
Bart Ribbers f5e350c0bd temp/plasma-bigscreen: remove
Moved upstream in https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/104116

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8841>
2026-06-17 08:54:06 +00:00
Clayton Craft 51b52fc2cc main/postmarketos-base-ui: revert flatpak hack
Flatpak 1.18 includes a proper fix[1] for #3816, so we can revert this
hack that delayed starting the helper until ntp was available. This also
means that boot will now be marked 'complete' in systemd before NTP is
up, which was a weird side-effect of this hack.

This reverts commit 96d714f167.

Signed-off-by: Clayton Craft <craftyguy@postmarketos.org>

1. https://patch-diff.githubusercontent.com/raw/flatpak/flatpak/pull/6547.patch

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8487>
2026-06-17 09:58:58 +02:00
Clayton Craft b04820297c linux-postmarketos-asahi: upgrade to 7.0.12-1
This also adds a patch that was sent upstream to allow enabling dynamic
ftrace on aarch64 with CFI=y

https://lore.kernel.org/all/20260609-arm64-ftrace-direct-calls-v1-0-4a46f266697f@linux.dev/

Signed-off-by: Clayton Craft <craftyguy@postmarketos.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8837>
2026-06-16 16:37:14 -07:00
Clayton Craft 8be47c7a33 main/postmarketos-base-ui-gnome: move install= from subpkg funcs
Signed-off-by: Clayton Craft <craftyguy@postmarketos.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8831>
2026-06-16 18:22:10 +00:00
Clayton Craft 138a8c01c3 main/postmarketos-base-ui-gnome: add "app provider" subpkgs
This adds two new subpackages, one pulls in in gnome software and the
other pulls in bazaar. Both subpackages provide a new virtual
(gnome-app-provider), and the main base GNOME UI pkg now depends on
this virtual. This allows us to ship bazaar in Duranium instead of GNOME
Software, and to continue to use GNOME Software by default on mutable
pmOS.

 Previously there was an "optional" dependency on a sw
app provider (gnome-software, via pmb_recommends), but I made it a hard
dependency now because:

1) I think users can expect *some* app store thing to be available
by default, and the number of users who would remove all of them is
probably approaching 0

2) Ignoring pmb_recommends made the rest of this easier to implement,
since I'm not entirely sure how pmb would react to a virtual provided
by the pkg it is processing pmb_recommends for, and I didn't want to
find out.

Fixes #4634

Signed-off-by: Clayton Craft <craftyguy@postmarketos.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8831>
2026-06-16 18:22:10 +00:00
Ferass El Hafidi fe736c32ea main/postmarketos-bootsplash: switch back to plymouth-openrc-plugin
With the openrc plugins hanging issues fixed in OpenRC 0.63.2, we can
now make use of plymouth-openrc-plugin once again.

This partially reverts commit f13be0f6b7.

Signed-off-by: Ferass El Hafidi <funderscore@postmarketos.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8811>
2026-06-16 16:58:21 +00:00
v34びょう 8ebe73581c postmarketos-config-nftables: bump pkgrel and checksum
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8820>
2026-06-16 16:18:55 +00:00
v34びょう a24583b9e7 postmarketos-config-nftables: block qmapmux interfaces
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8820>
2026-06-16 16:18:55 +00:00
postmarketOS CI f621576f12 linux-next: upgrade to next-20260616 2026-06-16 15:39:35 +00:00
Oliver Smith 2f121a4d14 docs: integrate COMMITSTYLE
Make a symlink at docs/merge-requests/commitstyle.md that points at the
COMMITSTYLE.md file, so it is part of the documentation at
https://docs.postmarketos.org/pmaports/.

Tweak the headline and link to Alpine's COMMITSTYLE.md so it looks
better in the version rendered at docs.postmarketos.org.

Signed-off-by: Oliver Smith <ollieparanoid@postmarketos.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8829>
2026-06-16 13:40:21 +00:00
Antoine Martin 2a902da452 device-pine64-pinenote: fix upgrade path for nonfree-firmware
Renames pre-upgrade script to post-upgrade script for non-freefirmware
subpackage.

This script creates stub files for where the waveform firmware should
be. When upgrading from 13-r0, the script detects files being there,
thus does not create the stub files. Unfortunately, since before
15-r0 those files are "owned" by the subpackage, they are removed
when upgrading, and thus the stub files are never created by the
pre-upgrade. By making this script post-upgrade, it'll recreate the
empty stub files so that the actual waveforms can be extracted by
the systemd / openrc boot-up service.

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8827>
2026-06-16 13:26:39 +00:00
Oliver Smith 4084d06f7b docs: approval-rules: simplify for stable branches
Don't describe how MRs to stable branches are done here, link to the
other page instead. Otherwise the approval rules should be the same as
for stable branches from now on.

Signed-off-by: Oliver Smith <ollieparanoid@postmarketos.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8812>
2026-06-16 13:30:02 +02:00
Oliver Smith 8d534ae3d6 docs: update merge-requests/stable-branches
* Describe relevant changes, especially that we may make non-backport
  changes if there is a patch release for a package that meanwhile has a
  higher version in main already (e.g. a kernel in main is on linux
  7.x.y while stable is on 6.18.z).

* Directly pushing to a stable branch should only be done during initial
  branch bringup, otherwise we shall always make MRs that go through CI.

* Update formatting and title of the page.

Signed-off-by: Oliver Smith <ollieparanoid@postmarketos.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8812>
2026-06-16 13:30:01 +02:00
Oliver Smith d13bed7d56 docs: make headlines more consistent
Signed-off-by: Oliver Smith <ollieparanoid@postmarketos.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8812>
2026-06-16 13:27:58 +02:00
Oliver Smith 5b69893122 docs: structure: move packaging related pages
Bring more structure into the docs by moving packaging related subpages
as well.

Signed-off-by: Oliver Smith <ollieparanoid@postmarketos.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8812>
2026-06-16 13:27:25 +02:00
Oliver Smith ac931d4507 docs: structure: move merge-requests related pages
Add a new "merge requests" page and move all related pages under that
page to give the docs more structure.

Signed-off-by: Oliver Smith <ollieparanoid@postmarketos.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8812>
2026-06-16 13:27:22 +02:00
Oliver Smith ae07d28bfb docs: structure: move CI related pages
Signed-off-by: Oliver Smith <ollieparanoid@postmarketos.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8812>
2026-06-16 13:24:21 +02:00
Clayton Craft 5932b59857 main/postmarketos-duranium: remove app store plugin conflicts
These conflicts in the sysext-dev-tools subpkg were intended to prevent
app store plugins from being pulled into the system extension image
(where they would not work as expected and cause confusion.) They were
causing an issue with how packages are snapshot in the duranium build CI
by causing a conflict when it tried to resolve base and sysext package
lists together (so install_if packages were included). The conflict
was from:

error: apk add --simulate failed:
ERROR: unable to select packages:
  gnome-software-plugin-apk2-0.0.3-r1:
    breaks: postmarketos-duranium-sysext-dev-tools-11-r0[!gnome-software-plugin-apk2]
    satisfies: world[gnome-software-plugin-apk]

It's much simpler to just remove these conflicts and add these plugins
to the list of RemovedPackages in duranium's mkosi config so they are
purged before main image is finalized.

Signed-off-by: Clayton Craft <craftyguy@postmarketos.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8761>
2026-06-16 06:40:02 +00:00