From 67e054aa5a1179054025762515a12b37d448dda0 Mon Sep 17 00:00:00 2001 From: "LevitatingBusinessMan (Rein Fernhout)" Date: Fri, 2 Oct 2026 00:08:11 +0200 Subject: [PATCH] mkosi,test: rename postmarketos to nura Recently, postmarketOS is renamed to Nura: See https://postmarketos.org/blog/2026/09/27/nura-rename/ mkosi already renamed postmarketOS to Nura: https://github.com/systemd/mkosi/commit/580c4d94d75ef18f2a0983626cfd80bea9c44ece Co-authored-by: Yu Watanabe (cherry picked from commit e9090fe18086edf48ef9f2ab420366b3c5f1d027) --- .github/workflows/mkosi.yml | 6 +++--- .github/workflows/unit-tests.yml | 6 +++--- mkosi/mkosi.conf.d/{postmarketos => nura}/mkosi.conf | 2 +- .../{postmarketos => nura}/mkosi.conf.d/debug.conf | 0 .../{postmarketos => nura}/mkosi.conf.d/efi.conf | 0 .../usr/lib/systemd/resolved.conf.d/disable-dnsovertls.conf | 0 .../usr/lib/systemd/resolved.conf.d/disable-mdns.conf | 0 .../mkosi.extra/usr/lib/sysusers.d/10-testuser.conf | 2 +- .../mkosi.extra/usr/lib/tmpfiles.d/10-testuser.conf | 2 +- .../mkosi.extra/usr/lib/udev/udev.conf | 0 .../usr/lib/systemd/system-preset/00-mkosi.preset | 6 +++--- .../mkosi.conf.d/{postmarketos => nura}/mkosi.build.chroot | 0 .../build/mkosi.conf.d/{postmarketos => nura}/mkosi.conf | 2 +- .../build/mkosi.conf.d/{postmarketos => nura}/mkosi.prepare | 0 .../mkosi.conf.d/{postmarketos.conf => nura.conf} | 2 +- .../mkosi.conf.d/{postmarketos.conf => nura.conf} | 2 +- .../mkosi.conf.d/{postmarketos.conf => nura.conf} | 4 ++-- .../mkosi.conf.d/{postmarketos.conf => nura.conf} | 4 ++-- src/test/test-loop-util.c | 2 +- test/test-execute/exec-dynamicuser-fixeduser-games.service | 2 +- test/units/TEST-07-PID1.private-pids.sh | 2 +- test/units/TEST-13-NSPAWN.nspawn.sh | 2 +- test/units/TEST-50-DISSECT.dissect.sh | 2 +- test/units/TEST-58-REPART.sh | 2 +- test/units/TEST-64-UDEV-STORAGE.sh | 2 +- test/units/TEST-67-INTEGRITY.sh | 2 +- test/units/TEST-75-RESOLVED.sh | 2 +- test/units/TEST-89-RESOLVED-MDNS.sh | 2 +- 28 files changed, 29 insertions(+), 29 deletions(-) rename mkosi/mkosi.conf.d/{postmarketos => nura}/mkosi.conf (97%) rename mkosi/mkosi.conf.d/{postmarketos => nura}/mkosi.conf.d/debug.conf (100%) rename mkosi/mkosi.conf.d/{postmarketos => nura}/mkosi.conf.d/efi.conf (100%) rename mkosi/mkosi.conf.d/{postmarketos => nura}/mkosi.extra/usr/lib/systemd/resolved.conf.d/disable-dnsovertls.conf (100%) rename mkosi/mkosi.conf.d/{postmarketos => nura}/mkosi.extra/usr/lib/systemd/resolved.conf.d/disable-mdns.conf (100%) rename mkosi/mkosi.conf.d/{postmarketos => nura}/mkosi.extra/usr/lib/sysusers.d/10-testuser.conf (71%) rename mkosi/mkosi.conf.d/{postmarketos => nura}/mkosi.extra/usr/lib/tmpfiles.d/10-testuser.conf (68%) rename mkosi/mkosi.conf.d/{postmarketos => nura}/mkosi.extra/usr/lib/udev/udev.conf (100%) rename mkosi/mkosi.images/build/mkosi.conf.d/{postmarketos => nura}/mkosi.build.chroot (100%) rename mkosi/mkosi.images/build/mkosi.conf.d/{postmarketos => nura}/mkosi.conf (82%) rename mkosi/mkosi.images/build/mkosi.conf.d/{postmarketos => nura}/mkosi.prepare (100%) rename mkosi/mkosi.images/minimal-base/mkosi.conf.d/{postmarketos.conf => nura.conf} (88%) rename mkosi/mkosi.initrd.conf/mkosi.conf.d/{postmarketos.conf => nura.conf} (95%) rename mkosi/mkosi.pkgenv/mkosi.conf.d/{postmarketos.conf => nura.conf} (82%) rename mkosi/mkosi.tools.conf/mkosi.conf.d/{postmarketos.conf => nura.conf} (52%) diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml index 2cf06b470a..27bb8c870d 100644 --- a/.github/workflows/mkosi.yml +++ b/.github/workflows/mkosi.yml @@ -84,7 +84,7 @@ jobs: release: "9" - distro: centos release: "10" - - distro: postmarketos + - distro: nura release: edge libc: musl skip: TEST-92-TPM2-SWTPM @@ -95,8 +95,8 @@ jobs: persist-credentials: false - uses: systemd/mkosi@71d7b67e01dc47ab5c51f24866c3e2195b9701d2 with: - # Bootstrapping a postmarketOS tools tree on the Ubuntu host needs apk - apk: ${{ matrix.distro == 'postmarketos' }} + # Bootstrapping a Nura tools tree on the Ubuntu host needs apk + apk: ${{ matrix.distro == 'nura' }} # Freeing up disk space with rm -rf can take multiple minutes. Since we don't need the extra free space # immediately, we remove the files in the background. However, we first move them to a different location diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index a97d95ab54..92379ec542 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -63,7 +63,7 @@ jobs: run: sudo --preserve-env=GITHUB_ACTIONS,CI,CROSS_ARCH .github/workflows/unit-tests.sh RUN_${{ matrix.run_phase }} build-musl: - name: Build & test (musl, postmarketOS) + name: Build & test (musl, Nura) runs-on: ubuntu-24.04 concurrency: group: ${{ github.workflow }}-musl-${{ github.ref }} @@ -76,14 +76,14 @@ jobs: - uses: systemd/mkosi@71d7b67e01dc47ab5c51f24866c3e2195b9701d2 with: - # Bootstrapping a postmarketOS tools tree on the Ubuntu host needs apk + # Bootstrapping a Nura tools tree on the Ubuntu host needs apk apk: true - name: Build tools tree run: | tee mkosi/mkosi.local.conf <partitions[PARTITION_ROOT].found); node = ASSERT_NOT_NULL(dissected->partitions[PARTITION_ROOT].node); - /* Carve a nested partition table into that partition, mimicking the pmOS/android case (663f0bf5cb) + /* Carve a nested partition table into that partition, mimicking the Alpine/Nura case (663f0bf5cb) * where a partition carries a partition table the kernel won't scan, as partition devices don't * support partition scanning. We write and read it back through the same partition node, so the * buffer cache stays coherent. */ diff --git a/test/test-execute/exec-dynamicuser-fixeduser-games.service b/test/test-execute/exec-dynamicuser-fixeduser-games.service index 6043589745..8bcb5b5e98 100644 --- a/test/test-execute/exec-dynamicuser-fixeduser-games.service +++ b/test/test-execute/exec-dynamicuser-fixeduser-games.service @@ -2,7 +2,7 @@ [Unit] Description=Test DynamicUser with static User= whose uid and gid are different # On Ubuntu or Debian, user games has uid==5 and gid==60. -# On Alpine/postmarketOS, the user 'games' in the 'games' and 'users' groups. +# On Alpine/Nura, the user 'games' in the 'games' and 'users' groups. [Service] Type=oneshot diff --git a/test/units/TEST-07-PID1.private-pids.sh b/test/units/TEST-07-PID1.private-pids.sh index e3c4fdf17c..abf94b82fc 100755 --- a/test/units/TEST-07-PID1.private-pids.sh +++ b/test/units/TEST-07-PID1.private-pids.sh @@ -50,7 +50,7 @@ testcase_basic() { systemd-run -p PrivatePIDs=yes --remain-after-exit --unit TEST-07-PID1-private-pid sleep infinity # Wait for ExecMainPID to be correctly populated as there might be a race between spawning service # and actual exec child process - # Note, Alpine/postmarketOS build coreutils with --enable-single-binary=symlinks. In that case, coreutils + # Note, Alpine/Nura build coreutils with --enable-single-binary=symlinks. In that case, coreutils # calls prctl(PR_SET_NAME, argv[0]), hence the comm will be the path to the symlink. If the sleep file is # a dedicated binary (like most other distributions do), the comm will be the filename, i.e. "sleep". So, # here we need to cut the directory part. diff --git a/test/units/TEST-13-NSPAWN.nspawn.sh b/test/units/TEST-13-NSPAWN.nspawn.sh index fb78674971..22bde76b6f 100755 --- a/test/units/TEST-13-NSPAWN.nspawn.sh +++ b/test/units/TEST-13-NSPAWN.nspawn.sh @@ -410,7 +410,7 @@ testcase_check_default_inaccessible_paths() { "/proc/timer_list" ) - # /proc/kcore may not exist on some kernels, e.g. Alpine/postmarketOS. + # /proc/kcore may not exist on some kernels, e.g. Alpine/Nura. if [[ -e /proc/kcore ]]; then inaccessible_paths+=( "/proc/kcore" diff --git a/test/units/TEST-50-DISSECT.dissect.sh b/test/units/TEST-50-DISSECT.dissect.sh index 54bdd125b5..ad6c064b92 100755 --- a/test/units/TEST-50-DISSECT.dissect.sh +++ b/test/units/TEST-50-DISSECT.dissect.sh @@ -11,7 +11,7 @@ set -o pipefail . /etc/os-release if [[ "${ID_LIKE:-}" == alpine ]]; then - # Alpine/postmarketOS builds libdevmapper and so on without systemd support, and seems to not wait for + # Alpine/Nura builds libdevmapper and so on without systemd support, and seems to not wait for # uevents for dm-X devices being processed by systemd-udevd. That causes a significant issue in # dissect-image.c especially when multiple dm-X devices are activated/deactivated in parallel. exit 0 diff --git a/test/units/TEST-58-REPART.sh b/test/units/TEST-58-REPART.sh index fd3eaf940c..dfca73d234 100755 --- a/test/units/TEST-58-REPART.sh +++ b/test/units/TEST-58-REPART.sh @@ -3191,7 +3191,7 @@ EOF assert_eq "$(findmnt "${btrfs_mntpoint_plain}" -o SOURCE -n)" "${loop}p1" dm_btrfs_encrypted="$(findmnt "${btrfs_mntpoint_encrypted}" -o SOURCE -n)" if [[ "$dm_btrfs_encrypted" != "/dev/mapper/btrfs-replace-encrypted" ]]; then - # When libdevmapper is built without UDEV_SYNC_SUPPORT (e.g. on Alpine/postmarketOS), + # When libdevmapper is built without UDEV_SYNC_SUPPORT (e.g. on Alpine/Nura), # it creates a device node under /dev/mapper/ instead of relying on udev to create a symlink. # In this case, verify that both device nodes refer to the same underlying device. assert_eq "$(stat -c %Hr:%Lr "$dm_btrfs_encrypted")" "$(stat -c %Hr:%Lr /dev/mapper/btrfs-replace-encrypted)" diff --git a/test/units/TEST-64-UDEV-STORAGE.sh b/test/units/TEST-64-UDEV-STORAGE.sh index 1806abfd83..734ea175a0 100755 --- a/test/units/TEST-64-UDEV-STORAGE.sh +++ b/test/units/TEST-64-UDEV-STORAGE.sh @@ -659,7 +659,7 @@ testcase_lvm_basic() { . /etc/os-release if [[ "$ID" == "ubuntu" || "${ID_LIKE:-}" == "alpine" ]]; then - echo "LVM on Ubuntu/alpine/postmarketos is broken, skipping the test" | tee --append /skipped + echo "LVM on Ubuntu/Alpine/Nura is broken, skipping the test" | tee --append /skipped exit 77 fi diff --git a/test/units/TEST-67-INTEGRITY.sh b/test/units/TEST-67-INTEGRITY.sh index a57d7d9db2..30c0ce2abf 100755 --- a/test/units/TEST-67-INTEGRITY.sh +++ b/test/units/TEST-67-INTEGRITY.sh @@ -129,7 +129,7 @@ for a in crc32c crc32 xxhash64 sha1 sha256; do modprobe -q "crypto-$a" || : # Some algorithms are not supported on certain platforms (e.g. crc32 is - # missing on Alpine/postmarketOS). Skip them at runtime to avoid spurious + # missing on Alpine/Nura). Skip them at runtime to avoid spurious # failures. if ! grep -q -E "^name\s+: $a\$" /proc/crypto; then echo "Algorithm '$a' is not supported on this system, skipping." diff --git a/test/units/TEST-75-RESOLVED.sh b/test/units/TEST-75-RESOLVED.sh index 017397baf1..b304ace20f 100755 --- a/test/units/TEST-75-RESOLVED.sh +++ b/test/units/TEST-75-RESOLVED.sh @@ -1129,7 +1129,7 @@ testcase_11_nft() { . /etc/os-release if [[ "${ID_LIKE:-}" == alpine ]]; then - # FIXME: For some reasons, the following tests will fail on alpine/postmarketos. + # FIXME: For some reasons, the following tests will fail on Alpine/Nura. return 0 fi diff --git a/test/units/TEST-89-RESOLVED-MDNS.sh b/test/units/TEST-89-RESOLVED-MDNS.sh index 227991334d..06df6b5378 100755 --- a/test/units/TEST-89-RESOLVED-MDNS.sh +++ b/test/units/TEST-89-RESOLVED-MDNS.sh @@ -8,7 +8,7 @@ set -o pipefail . /etc/os-release if [[ "${ID_LIKE:-}" == alpine ]]; then - # FIXME: For some reasons (maybe this test requires nss module??), the test fails on alpine/postmarketos. + # FIXME: For some reasons (maybe this test requires nss module??), the test fails on Alpine/Nura. exit 77 fi