fixes #3153

This patch was submitted upstream to Alpine aports in
https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/71426

[ci:skip-vercheck]
[ci:skip-build] already built successfully in CI

actual patch to support usr merge will come later

rebased on aports

Caleb Connolly authored 8 months ago and Clayton Craft committed 7 months ago

Upgrade to 46-mobile-0

[ci:skip-build]: already built successfully in CI

Caleb Connolly authored 8 months ago and Clayton Craft committed 7 months ago

mobile shell has a fork of GSD which hard depends on systemd.

Signed-off-by: Caleb Connolly <caleb@postmarketos.org>

TODO: (clayton) we need to revert the part of this patch that removes
the version in pmaports/temp, before merging into master

Jane Rachinger authored 9 months ago and Clayton Craft committed 7 months ago

also remove the elogind specific patch to use systemd for brightness
changes

Co-authored-by: Clayton Craft <clayton@craftyguy.net>

Note: the user services that the -systemd split pkg installs are not
enabled by default using systemd presets. None of them have 'Install'
sections, they appear to be mostly/all dbus activated instead.

[ci:ignore-count]
[ci:skip-build]: already built successfully in CI

Jane Rachinger authored 9 months ago and Clayton Craft committed 7 months ago

Co-authored-by: Clayton Craft <clayton@craftyguy.net>

Jane Rachinger authored 9 months ago and Clayton Craft committed 7 months ago

Co-authored-by: Clayton Craft <clayton@craftyguy.net>

Jane Rachinger authored 9 months ago and Clayton Craft committed 7 months ago

Co-authored-by: Clayton Craft <clayton@craftyguy.net>

Jane Rachinger authored 9 months ago and Clayton Craft committed 7 months ago

Co-authored-by: Clayton Craft <clayton@craftyguy.net>

- Removed systemd-timesyncd, already enabled by a preset installed by
  the systemd package
- Removed default-disable.preset, it's already provided by the systemd
  package
- Removed user services from system preset

also remove the rc_update workaround

Co-authored-by: jane400 <pmos@j4ne.de>

Jane Rachinger authored 9 months ago and Clayton Craft committed 7 months ago

Note: I/Clayton bumped the pkgrel because I don't want to
ci:skip-vercheck for *all* packages in the branch just to so that this
one doesn't fail.

Jane Rachinger authored 9 months ago and Clayton Craft committed 7 months ago

Co-authored-by: Clayton Craft <clayton@craftyguy.net>

These macros are based off of the upstream systemd RPM macros, but it
doesn't implement all of the macro functionality upstream. Initially
they will be used in the install scripts for apkbuilds that provide
systemd service unit files.

For example, a `$pkgname-systemd.post-install` script might have:
    . /usr/lib/systemd/systemd-apk-macros.sh
    systemd_service-post_install system sshd

And a `$pkgname-systemd.pre-deinstall` script might have:
    . /usr/lib/systemd/systemd-apk-macros.sh
    systemd_service_pre_deinstall user pipewire

One day maybe these could be upstreamed to systemd to provide some
apk/abuild compatible macros.

Co-authored-by: jane400 <pmos@j4ne.de>

Jane Rachinger authored 9 months ago and Clayton Craft committed 7 months ago

Generating the machine-id is handled by systemd's first boot mechanism,
so that was removed from the dbus post-install script

Bart Ribbers authored 8 months ago and Clayton Craft committed 7 months ago

It installs /usr/lib/systemd/user/plasma-kglobalaccel.service

[ci:skip-build] already built successfully in CI

The space here caused this install script to attempt to create a group
named '2' and add a user named 'sgx' to it.

[ci:skip-build] already built successfully in CI

Caleb Connolly authored 8 months ago and Clayton Craft committed 7 months ago

Update to the reworked apk-tools /usr merge support.

Upstream MR: https://gitlab.alpinelinux.org/alpine/apk-tools/-/merge_requests/155



Fixes: #2988

Signed-off-by: Caleb Connolly <caleb@postmarketos.org>

[ci:skip-build] already built successfully in CI

Fails in CI, and (according to Bart) might be disabled on this arch in
upstream aports later.

Jane Rachinger authored 9 months ago and Clayton Craft committed 7 months ago

Co-authored-by: Clayton Craft <clayton@craftyguy.net>

[ci:skip-build] already built successfully in CI

Caleb Connolly authored 9 months ago and Clayton Craft committed 7 months ago

Signed-off-by: Caleb Connolly <caleb@postmarketos.org>

[ci:skip-vercheck]
[ci:skip-build] already built successfully in CI

updated pkgver to follow format used elsewhere... "999$_pkgver"

FYI the autoreconf thing was sent to aports since this is fixing an
upstream packaging bug:

https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/69432

Missed this earlier when moving -service --> -systemd

Also updates the pkgver to be more in line with how we handle pkgver
elsewhere in this repo

David Heidelberg authored 10 months ago and Clayton Craft committed 7 months ago

Signed-off-by: David Heidelberg <david@ixit.cz>

[ci:skip-build] already built successfully in CI