systemd: apk-tools upgrade/reinstall fails

on master_staging_systemd branch:

$ pmbootstrap chroot apk -- fix -r apk-tools
[13:49:24] Pmbootstrap v3.0.0_alpha (Python 3.12.4 (main, Aug  1 2024, 12:52:32) [GCC 13.2.1 20240309])
[13:49:24] $ pmbootstrap /home/clayton/src/pmbootstrap/pmbootstrap.py --details-to-stdout chroot apk -- fix -r apk-tools
...
(1/1) Reinstalling apk-tools (9992.14-r7)
apk-tools-9992.14-r7: [USRMERGE] Rewrite lib/ to usr/lib/
apk-tools-9992.14-r7: [USRMERGE] Rewrite lib/apk/ to usr/lib/apk/
apk-tools-9992.14-r7: [USRMERGE] Rewrite lib/apk/exec/ to usr/lib/apk/exec/
apk-tools-9992.14-r7: [USRMERGE] Rewrite lib/libapk.so.2.14.0 to usr/lib/libapk.so.2.14.0
apk-tools-9992.14-r7: [USRMERGE] Rewrite sbin/ to usr/bin/
apk-tools-9992.14-r7: [USRMERGE] Rewrite sbin/apk to usr/bin/apk
ERROR: apk-tools-9992.14-r7: failed to rename lib/.apk.1d08af1c0804157aaf616817437f70fba4b7eb2569ce385a to lib/libapk.so.2.14.0.
ERROR: apk-tools-9992.14-r7: failed to rename sbin/.apk.e692845a70b97217412edcec46095a12fd813646579165bd to sbin/apk.
Executing busybox-1.36.1-r31.trigger
1 error; 9 MiB in 17 packages

full output from pmbootstrap / apk

$ pmbootstrap chroot apk -- fix -r apk-tools
[13:49:24] Pmbootstrap v3.0.0_alpha (Python 3.12.4 (main, Aug  1 2024, 12:52:32) [GCC 13.2.1 20240309])
[13:49:24] $ pmbootstrap /home/clayton/src/pmbootstrap/pmbootstrap.py --details-to-stdout chroot apk -- fix -r apk-tools
[13:49:24] % cd /home/clayton/.local/var/pmbootstrap/cache_git/pmaports; git remote -v
[13:49:24] % cd /home/clayton/.local/var/pmbootstrap/cache_git/pmaports; git show origin/master:channels.cfg
[13:49:24] NOTE: Skipped apk version check for chroot 'native', because it is not installed yet!
[13:49:24] % doas mkdir -p /home/clayton/.local/var/pmbootstrap/chroot_native/dev
doas (clayton@lappy) password:
[13:49:26] % doas mount -t tmpfs -o size=1M,noexec,dev tmpfs /home/clayton/.local/var/pmbootstrap/chroot_native/dev
[13:49:26] % doas mkdir -p /home/clayton/.local/var/pmbootstrap/chroot_native/dev/pts /home/clayton/.local/var/pmbootstrap/chroot_native/dev/shm
[13:49:26] % doas mount -t tmpfs -o nodev,nosuid,noexec tmpfs /home/clayton/.local/var/pmbootstrap/chroot_native/dev/shm
[13:49:26] % doas mknod -m 666 /home/clayton/.local/var/pmbootstrap/chroot_native/dev/null c 1 3
[13:49:26] % doas mknod -m 666 /home/clayton/.local/var/pmbootstrap/chroot_native/dev/zero c 1 5
[13:49:26] % doas mknod -m 666 /home/clayton/.local/var/pmbootstrap/chroot_native/dev/full c 1 7
[13:49:26] % doas mknod -m 644 /home/clayton/.local/var/pmbootstrap/chroot_native/dev/random c 1 8
[13:49:26] % doas mknod -m 644 /home/clayton/.local/var/pmbootstrap/chroot_native/dev/urandom c 1 9
[13:49:26] % doas ln -sf /proc/self/fd /home/clayton/.local/var/pmbootstrap/chroot_native/dev/
[13:49:26] % doas mkdir -p /home/clayton/.local/var/pmbootstrap/chroot_native/proc
[13:49:26] % doas mount --bind /proc /home/clayton/.local/var/pmbootstrap/chroot_native/proc
[13:49:26] % doas mkdir -p /home/clayton/.local/var/pmbootstrap/chroot_native/var/cache/apk
[13:49:26] % doas mount --bind /home/clayton/.local/var/pmbootstrap/cache_apk_aarch64 /home/clayton/.local/var/pmbootstrap/chroot_native/var/cache/apk
[13:49:26] % doas mkdir -p /home/clayton/.local/var/pmbootstrap/chroot_native/mnt/appstream-data
[13:49:26] % doas mount --bind /home/clayton/.local/var/pmbootstrap/cache_appstream/aarch64/edge /home/clayton/.local/var/pmbootstrap/chroot_native/mnt/appstream-data
[13:49:26] % doas mkdir -p /home/clayton/.local/var/pmbootstrap/chroot_native/mnt/pmbootstrap/ccache
[13:49:26] % doas mount --bind /home/clayton/.local/var/pmbootstrap/cache_ccache_aarch64 /home/clayton/.local/var/pmbootstrap/chroot_native/mnt/pmbootstrap/ccache
[13:49:26] % doas mkdir -p /home/clayton/.local/var/pmbootstrap/chroot_native/var/cache/distfiles
[13:49:26] % doas mount --bind /home/clayton/.local/var/pmbootstrap/cache_distfiles /home/clayton/.local/var/pmbootstrap/chroot_native/var/cache/distfiles
[13:49:26] % doas mkdir -p /home/clayton/.local/var/pmbootstrap/chroot_native/mnt/pmbootstrap/git
[13:49:26] % doas mount --bind /home/clayton/.local/var/pmbootstrap/cache_git /home/clayton/.local/var/pmbootstrap/chroot_native/mnt/pmbootstrap/git
[13:49:26] % doas mkdir -p /home/clayton/.local/var/pmbootstrap/chroot_native/mnt/pmbootstrap/go
[13:49:26] % doas mount --bind /home/clayton/.local/var/pmbootstrap/cache_go /home/clayton/.local/var/pmbootstrap/chroot_native/mnt/pmbootstrap/go
[13:49:26] % doas mkdir -p /home/clayton/.local/var/pmbootstrap/chroot_native/mnt/pmbootstrap/rust
[13:49:26] % doas mount --bind /home/clayton/.local/var/pmbootstrap/cache_rust /home/clayton/.local/var/pmbootstrap/chroot_native/mnt/pmbootstrap/rust
[13:49:26] % doas mkdir -p /home/clayton/.local/var/pmbootstrap/chroot_native/mnt/pmbootstrap/abuild-config
[13:49:26] % doas mount --bind /home/clayton/.local/var/pmbootstrap/config_abuild /home/clayton/.local/var/pmbootstrap/chroot_native/mnt/pmbootstrap/abuild-config
[13:49:26] % doas mkdir -p /home/clayton/.local/var/pmbootstrap/chroot_native/etc/apk/keys
[13:49:26] % doas mount --bind /home/clayton/.local/var/pmbootstrap/config_apk_keys /home/clayton/.local/var/pmbootstrap/chroot_native/etc/apk/keys
[13:49:26] % doas mkdir -p /home/clayton/.local/var/pmbootstrap/chroot_native/mnt/pmbootstrap/sccache
[13:49:26] % doas mount --bind /home/clayton/.local/var/pmbootstrap/cache_sccache /home/clayton/.local/var/pmbootstrap/chroot_native/mnt/pmbootstrap/sccache
[13:49:26] % doas mkdir -p /home/clayton/.local/var/pmbootstrap/chroot_native/mnt/pmbootstrap/netboot
[13:49:26] % doas mount --bind /home/clayton/.local/var/pmbootstrap/images_netboot /home/clayton/.local/var/pmbootstrap/chroot_native/mnt/pmbootstrap/netboot
[13:49:26] % doas mkdir -p /home/clayton/.local/var/pmbootstrap/chroot_native/mnt/pmbootstrap/packages
[13:49:26] % doas mount --bind /home/clayton/.local/var/pmbootstrap/packages /home/clayton/.local/var/pmbootstrap/chroot_native/mnt/pmbootstrap/packages
[13:49:26] % doas touch /home/clayton/.local/var/pmbootstrap/chroot_native/in-pmbootstrap
[13:49:26] sigfilename: sbin/apk.static.SIGN.RSA.alpine-devel@lists.alpinelinux.org-616ae350.rsa.pub
[13:49:26] sigkey: alpine-devel@lists.alpinelinux.org-616ae350.rsa.pub
[13:49:26] extracted: /tmp/pmbootstrapuwcigc5yapk
[13:49:26] extracted: /tmp/pmbootstrap1jy6kfwosig
[13:49:26] Verify apk.static signature with /home/clayton/src/pmbootstrap/pmb/data/keys/alpine-devel@lists.alpinelinux.org-616ae350.rsa.pub
[13:49:26] % openssl dgst -sha1 -verify /home/clayton/src/pmbootstrap/pmb/data/keys/alpine-devel@lists.alpinelinux.org-616ae350.rsa.pub -signature /tmp/pmbootstrap1jy6kfwosig /tmp/pmbootstrapuwcigc5yapk
Verified OK
[13:49:26] Verify the version reported by the apk.static binary (must match the package version 2.14.4-r2)
[13:49:26] % /tmp/pmbootstrapuwcigc5yapk --version
apk-tools 2.14.4, compiled for aarch64.
[13:49:26] (native) Creating chroot
[13:49:26] % doas ln -s -f /var/cache/apk /home/clayton/.local/var/pmbootstrap/chroot_native/etc/apk/cache
[13:49:26] % doas cp /etc/resolv.conf /home/clayton/.local/var/pmbootstrap/chroot_native/etc/resolv.conf
[13:49:26] % doas mkdir -p /home/clayton/.local/var/pmbootstrap/chroot_native/etc/apk
[13:49:26] (native) update /etc/apk/repositories
[13:49:26] % doas sh -c echo http://mirror.postmarketos.org/postmarketos/staging/systemd/master >> /home/clayton/.local/var/pmbootstrap/chroot_native/etc/apk/repositories
[13:49:26] % doas sh -c echo http://mirror.postmarketos.org/postmarketos/master >> /home/clayton/.local/var/pmbootstrap/chroot_native/etc/apk/repositories
[13:49:26] % doas sh -c echo http://dl-cdn.alpinelinux.org/alpine/edge/main >> /home/clayton/.local/var/pmbootstrap/chroot_native/etc/apk/repositories
[13:49:26] % doas sh -c echo http://dl-cdn.alpinelinux.org/alpine/edge/community >> /home/clayton/.local/var/pmbootstrap/chroot_native/etc/apk/repositories
[13:49:26] % doas sh -c echo http://dl-cdn.alpinelinux.org/alpine/edge/testing >> /home/clayton/.local/var/pmbootstrap/chroot_native/etc/apk/repositories
[13:49:26] % doas mkdir -p /home/clayton/.local/var/pmbootstrap/tmp
[13:49:26] % doas rm -f /home/clayton/.local/var/pmbootstrap/tmp/apk_progress_fifo
[13:49:26] % doas mkfifo /home/clayton/.local/var/pmbootstrap/tmp/apk_progress_fifo
[13:49:26] % doas cat /home/clayton/.local/var/pmbootstrap/tmp/apk_progress_fifo
[13:49:26] % doas sh -c exec 3>/home/clayton/.local/var/pmbootstrap/tmp/apk_progress_fifo; /home/clayton/.local/var/pmbootstrap/apk.static --no-progress --progress-fd 3 --root /home/clayton/.local/var/pmbootstrap/chroot_native --cache-dir /home/clayton/.local/var/pmbootstrap/cache_apk_aarch64 --initdb --arch aarch64 --repository /home/clayton/.local/var/pmbootstrap/packages/systemd-edge --repository /home/clayton/.local/var/pmbootstrap/packages/edge add alpine-base --no-interactive ;
[13:49:26] New background process: pid=13666, output=background
WARNING: opening /home/clayton/.local/var/pmbootstrap/packages/edge: No such file or directory
WARNING: opening /home/clayton/.local/var/pmbootstrap/packages/systemd-edge: No such file or directory
(1/17) Installing alpine-baselayout-data (3.6.6-r0)
(2/17) Installing musl (1.2.5-r1)
(3/17) Installing busybox (1.36.1-r31)
Executing busybox-1.36.1-r31.post-install
(4/17) Installing busybox-binsh (1.36.1-r31)
(5/17) Installing alpine-baselayout (3.6.6-r0)
Executing alpine-baselayout-3.6.6-r0.pre-install
Executing alpine-baselayout-3.6.6-r0.post-install
(6/17) Installing alpine-keys (2.4-r1)
(7/17) Installing alpine-release (9999-r0)
(8/17) Installing ca-certificates-bundle (20240705-r0)
(9/17) Installing libcrypto3 (3.3.1-r3)
(10/17) Installing libssl3 (3.3.1-r3)
(11/17) Installing ssl_client (1.36.1-r31)
(12/17) Installing zlib (1.3.1-r1)
(13/17) Installing apk-tools (9992.14-r7)
(14/17) Installing busybox-suid (1.36.1-r31)
(15/17) Installing scanelf (1.3.7-r2)
(16/17) Installing musl-utils (1.2.5-r1)
(17/17) Installing alpine-base (9999-r0)
Executing busybox-1.36.1-r31.trigger
OK: 9 MiB in 17 packages
[13:49:27] (native) merge /usr
[13:49:27] % doas sh -e /home/clayton/src/pmbootstrap/pmb/data/merge-usr.sh CALLED_FROM_PMB /home/clayton/.local/var/pmbootstrap/chroot_native
[13:49:27] (native) % adduser -D pmos -u 12345
[13:49:27] (native) % busybox su pmos -c HOME=/home/pmos ln -s /mnt/pmbootstrap/abuild-config /home/pmos/.abuild ;
[13:49:27] (native) % chown pmos:pmos /mnt/pmbootstrap/abuild-config
[13:49:27] (native) % busybox su pmos -c HOME=/home/pmos ln -s /mnt/pmbootstrap/ccache /home/pmos/.ccache ;
[13:49:27] (native) % chown pmos:pmos /mnt/pmbootstrap/ccache
[13:49:27] (native) % busybox su pmos -c HOME=/home/pmos mkdir -p /home/pmos/.cache ;
[13:49:27] (native) % busybox su pmos -c HOME=/home/pmos ln -s /mnt/pmbootstrap/go/gocache /home/pmos/.cache/go-build ;
[13:49:27] (native) % chown pmos:pmos /mnt/pmbootstrap/go/gocache
[13:49:27] (native) % busybox su pmos -c HOME=/home/pmos mkdir -p /home/pmos/go/pkg ;
[13:49:27] (native) % busybox su pmos -c HOME=/home/pmos ln -s /mnt/pmbootstrap/go/gomodcache /home/pmos/go/pkg/mod ;
[13:49:27] (native) % chown pmos:pmos /mnt/pmbootstrap/go/gomodcache
[13:49:27] (native) % busybox su pmos -c HOME=/home/pmos mkdir -p /home/pmos/.cargo/git ;
[13:49:27] (native) % busybox su pmos -c HOME=/home/pmos ln -s /mnt/pmbootstrap/rust/git/db /home/pmos/.cargo/git/db ;
[13:49:27] (native) % chown pmos:pmos /mnt/pmbootstrap/rust/git/db
[13:49:27] (native) % busybox su pmos -c HOME=/home/pmos mkdir -p /home/pmos/.cargo/registry ;
[13:49:27] (native) % busybox su pmos -c HOME=/home/pmos ln -s /mnt/pmbootstrap/rust/registry/cache /home/pmos/.cargo/registry/cache ;
[13:49:27] (native) % chown pmos:pmos /mnt/pmbootstrap/rust/registry/cache
[13:49:27] (native) % busybox su pmos -c HOME=/home/pmos ln -s /mnt/pmbootstrap/rust/registry/index /home/pmos/.cargo/registry/index ;
[13:49:27] (native) % chown pmos:pmos /mnt/pmbootstrap/rust/registry/index
[13:49:27] (native) % busybox su pmos -c HOME=/home/pmos ln -s /mnt/pmbootstrap/sccache /home/pmos/.cache/sccache ;
[13:49:27] (native) % chown pmos:pmos /mnt/pmbootstrap/sccache
[13:49:27] (native) update /etc/apk/repositories
[13:49:27] % doas rm /home/clayton/.local/var/pmbootstrap/chroot_native/etc/apk/repositories
[13:49:27] % doas sh -c echo /mnt/pmbootstrap/packages/systemd-edge >> /home/clayton/.local/var/pmbootstrap/chroot_native/etc/apk/repositories
[13:49:27] % doas sh -c echo /mnt/pmbootstrap/packages/edge >> /home/clayton/.local/var/pmbootstrap/chroot_native/etc/apk/repositories
[13:49:27] % doas sh -c echo http://mirror.postmarketos.org/postmarketos/staging/systemd/master >> /home/clayton/.local/var/pmbootstrap/chroot_native/etc/apk/repositories
[13:49:27] % doas sh -c echo http://mirror.postmarketos.org/postmarketos/master >> /home/clayton/.local/var/pmbootstrap/chroot_native/etc/apk/repositories
[13:49:27] % doas sh -c echo http://dl-cdn.alpinelinux.org/alpine/edge/main >> /home/clayton/.local/var/pmbootstrap/chroot_native/etc/apk/repositories
[13:49:27] % doas sh -c echo http://dl-cdn.alpinelinux.org/alpine/edge/community >> /home/clayton/.local/var/pmbootstrap/chroot_native/etc/apk/repositories
[13:49:27] % doas sh -c echo http://dl-cdn.alpinelinux.org/alpine/edge/testing >> /home/clayton/.local/var/pmbootstrap/chroot_native/etc/apk/repositories
[13:49:27] (native) % apk fix -r apk-tools
[13:49:27] (native) % apk fix -r apk-tools
[13:49:27] *** output passed to pmbootstrap stdout, not to this log ***
WARNING: opening /mnt/pmbootstrap/packages/systemd-edge: No such file or directory
WARNING: opening /mnt/pmbootstrap/packages/edge: No such file or directory
(1/1) Reinstalling apk-tools (9992.14-r7)
apk-tools-9992.14-r7: [USRMERGE] Rewrite lib/ to usr/lib/
apk-tools-9992.14-r7: [USRMERGE] Rewrite lib/apk/ to usr/lib/apk/
apk-tools-9992.14-r7: [USRMERGE] Rewrite lib/apk/exec/ to usr/lib/apk/exec/
apk-tools-9992.14-r7: [USRMERGE] Rewrite lib/libapk.so.2.14.0 to usr/lib/libapk.so.2.14.0
apk-tools-9992.14-r7: [USRMERGE] Rewrite sbin/ to usr/bin/
apk-tools-9992.14-r7: [USRMERGE] Rewrite sbin/apk to usr/bin/apk
ERROR: apk-tools-9992.14-r7: failed to rename lib/.apk.1d08af1c0804157aaf616817437f70fba4b7eb2569ce385a to lib/libapk.so.2.14.0.
ERROR: apk-tools-9992.14-r7: failed to rename sbin/.apk.e692845a70b97217412edcec46095a12fd813646579165bd to sbin/apk.
Executing busybox-1.36.1-r31.trigger
1 error; 9 MiB in 17 packages