mkosi: switch deb packaging to ci/v258-stable

semaphore: switch to ci/v258-stable branch
debian/master now installs new files for main, time to switch
2025-11-21 09:44:44 +01:00 · 2025-10-08 14:05:29 +01:00 · 2025-10-08 14:05:29 +01:00 · 2025-10-08 14:05:29 +01:00 · 2025-10-08 14:05:29 +01:00 · 2025-10-08 14:05:29 +01:00
6 changed files with 32 additions and 4 deletions
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@ -110,7 +110,7 @@ jobs:
            no_kvm: 0
            shim: 0
          - distro: fedora
-            release: "42"
+            release: "43"
            runner: ubuntu-24.04
            sanitizers: address,undefined
            llvm: 1
--- a/.semaphore/semaphore-runner.sh
+++ b/.semaphore/semaphore-runner.sh
@ -7,7 +7,7 @@ set -o pipefail
 DISTRO="${DISTRO:-debian}"
 RELEASE="${RELEASE:-bookworm}"
 SALSA_URL="${SALSA_URL:-https://salsa.debian.org/systemd-team/systemd.git}"
-BRANCH="${BRANCH:-debian/master}"
+BRANCH="${BRANCH:-ci/v258-stable}"
 ARCH="${ARCH:-amd64}"
 CONTAINER="${RELEASE}-${ARCH}"
 CACHE_DIR=/var/tmp
--- a/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf
+++ b/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf
@ -37,6 +37,7 @@ Packages=
        btrfs-progs
        apt
        bind9-dnsutils
+        bsdutils
        cryptsetup-bin
        dbus-broker
        dbus-user-session
--- a/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/knot.conf
+++ b/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/knot.conf
@ -0,0 +1,26 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+# New package needed for TEST-75-RESOLVED
+
+[TriggerMatch]
+Distribution=debian
+Release=!bullseye
+Release=!bookworm
+Release=!trixie
+# TODO: drop once Duke ships
+Release=!oldstable
+# TODO: drop once Forky ships
+Release=!stable
+
+[TriggerMatch]
+Distribution=ubuntu
+Release=!jammy
+Release=!noble
+Release=!plucky
+Release=!questing
+
+[TriggerMatch]
+Distribution=kali
+
+[Content]
+Packages=knot-keymgr
--- a/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf
+++ b/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf
@ -4,6 +4,6 @@
 Environment=
        GIT_URL=https://salsa.debian.org/systemd-team/systemd.git
        GIT_SUBDIR=debian
-        GIT_BRANCH=debian/master
-        GIT_COMMIT=8ba719208ff28f36bc240328725eb10008838c39
+        GIT_BRANCH=ci/v258-stable
+        GIT_COMMIT=9e5e8550f9413206441aaebe898511b3985b61ae
        PKG_SUBDIR=debian
--- a/mkosi/mkosi.sanitizers/mkosi.postinst
+++ b/mkosi/mkosi.sanitizers/mkosi.postinst
@ -90,6 +90,7 @@ wrap=(
    socat
    sshd
    stat
+    stress-ng
    su
    tar
    tgtd
Author	SHA1	Message	Date
Luca Boccassi	e9043181fd	mkosi: switch deb packaging to ci/v258-stable	2025-10-08 14:05:29 +01:00
Luca Boccassi	78bf9c3d4b	semaphore: switch to ci/v258-stable branch debian/master now installs new files for main, time to switch	2025-10-08 14:05:29 +01:00
Luca Boccassi	7151cbf5f7	mkosi: pull in new knot package for TEST-75-RESOLVED 5728s TEST-75-RESOLVED.sh[439]: /usr/lib/systemd/tests/testdata/units/TEST-75-RESOLVED.sh: line 154: keymgr: command not found The command was split out into a new package (cherry picked from commit 6602a5f7208edd456569343f61b7e5661b0ce299)	2025-10-08 14:05:29 +01:00
Yu Watanabe	ee59d887f0	mkosi: bump fedora from 42 to 43 It seems - the address sanitizer on fedora 42 reports false-positive, or - probing partitions in libblkid 2.40.4 has a bug. Not sure which causes the issue, but anyway the address sanitizer kills udev-worker when sym_blkid_partition_get_name() is called in udev-builtin-blkid.c. ``` systemd-udevd[488]: ==488==ERROR: AddressSanitizer: stack-buffer-underflow on address 0x7ffdd716e020 at pc 0x563e3ca66fcb bp 0x7ffdd716d970 sp 0x7ffdd716d968 systemd-udevd[488]: READ of size 8 at 0x7ffdd716e020 thread T0 ((udev-worker)) (snip) systemd-udevd[488]: HINT: this may be a false positive if your program uses some custom stack unwind mechanism, swapcontext or vfork systemd-udevd[488]: (longjmp and C++ exceptions are supported) systemd-udevd[488]: SUMMARY: AddressSanitizer: stack-buffer-underflow (/usr/bin/udevadm+0x187fca) (BuildId: 1fb56dbdf0447aba1185d6e34560b782b76098be) (snip) systemd-udevd[488]: Command: (udev-worker) systemd-udevd[488]: ==488==ABORTING ``` Let's bump fedora from 42 to 43. Fixes mkosi fedora 42 job failures after c349edfe49dc2c4b8a79e5d08ecf7c8e93c4c909. (cherry picked from commit 97940e77a9e347085a0b174bafa90a2823f43657)	2025-10-08 14:05:29 +01:00
Luca Boccassi	94378de939	mkosi: pull in bsdutils for script, used by various integration tests 4971s TEST-74-AUX-UTILS.sh[1212]: + script -ec 'networkctl edit --runtime "$NETWORK_NAME"' /dev/null 4971s TEST-74-AUX-UTILS.sh[1269]: .//usr/lib/systemd/tests/testdata/units/TEST-74-AUX-UTILS.networkctl.sh: line 55: script: command not found Currently works due to a transitive dependency somewhere else that is being dropped, pull it in directly given the tool is used by the tests (cherry picked from commit d5eb732724b22adca886c6e10941881b42b47c65)	2025-10-08 14:05:29 +01:00
Daan De Meyer	ce4857f29d	mkosi: Add stress-ng to sanitizer wrapper programs (cherry picked from commit db35a83fe91f651cb98ac7a594dc5169ced34285)	2025-10-08 14:05:29 +01:00