Merging upstream version 256.2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

16 files changed, 76 insertions, 30 deletions

diff --git a/mkosi.images/system/mkosi.conf b/mkosi.images/system/mkosi.conf
index 562650a..f8a91df 100644
--- a/mkosi.images/system/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf
@@ -4,7 +4,6 @@
 InitrdInclude=initrd/
 
 [Output]
-@Format=directory
 RepartDirectories=mkosi.repart
 
 [Content]
@@ -17,6 +16,7 @@ ExtraTrees=
 PostInstallationScripts=mkosi.sanitizers.chroot
 
 InitrdPackages=
+        btrfs-progs
         findutils
         grep
         sed
@@ -26,6 +26,7 @@ Packages=
         attr
         bash-completion
         bpftrace
+        btrfs-progs
         clang
         coreutils
         curl
@@ -55,6 +56,7 @@ Packages=
         opensc
         openssl
         p11-kit
+        pciutils
         python3
         qrencode
         radvd
diff --git a/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot b/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot
index 1f6e0c3..2c99a67 100755
--- a/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot
+++ b/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot
@@ -16,7 +16,7 @@ fi
 
 # We can't configure the source or build directory so we use symlinks instead to make sure they are in the
 # expected locations.
-ln --symbolic "$SRCDIR" "pkg/$ID/systemd-stable"
+ln --symbolic "$SRCDIR" "pkg/$ID/systemd"
 ln --symbolic "$BUILDDIR" "pkg/$ID/build"
 # Because we run with --noextract we are responsible for making sure the source files appear in src/.
 ln --symbolic . "pkg/$ID/src"
@@ -90,4 +90,10 @@ env --chdir="pkg/$ID" \
     PKGEXT=".pkg.tar" \
     MESON_EXTRA_CONFIGURE_OPTIONS="$MKOSI_MESON_OPTIONS $MESON_OPTIONS"
 
+(
+    shopt -s nullglob
+    rm -f "$BUILDDIR"/*.pkg.tar
+)
+
 cp "$OUTPUTDIR"/*.pkg.tar "$PACKAGEDIR"
+cp "$OUTPUTDIR"/*.pkg.tar "$BUILDDIR"
diff --git a/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf
index 036b0a3..96ae8c8 100644
--- a/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf
@@ -7,7 +7,7 @@ Distribution=arch
 Environment=
         GIT_URL=https://gitlab.archlinux.org/archlinux/packaging/packages/systemd.git
         GIT_BRANCH=main
-        GIT_COMMIT=dc6c099e0785753c1c88b4adcbcbfc209a8d12e3
+        GIT_COMMIT=d74b24c7c6077740c35a876445febe6d26bf013c
 
 VolatilePackages=
         systemd
@@ -20,7 +20,6 @@ VolatilePackages=
 Packages=
         bind
         bpf
-        btrfs-progs
         compiler-rt
         compsize
         cryptsetup
@@ -43,6 +42,7 @@ Packages=
         openssh
         openssl
         pacman
+        perf
         pkgconf
         polkit
         procps-ng
@@ -61,7 +61,6 @@ Packages=
         vim
 
 InitrdPackages=
-        btrfs-progs
         compiler-rt
         tpm2-tools
 
diff --git a/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot b/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot
index 2c05787..21f1062 100755
--- a/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot
+++ b/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot
@@ -113,4 +113,10 @@ CXX_LD="$( ((LLVM)) && echo lld)" \
     --noclean \
     "pkg/$ID/systemd.spec"
 
+(
+    shopt -s nullglob
+    rm -f "$BUILDDIR"/*.rpm
+)
+
 cp "$OUTPUTDIR"/*.rpm "$PACKAGEDIR"
+cp "$OUTPUTDIR"/*.rpm "$BUILDDIR"
diff --git a/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.conf
index 6fbd507..f200409 100644
--- a/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.conf
@@ -50,6 +50,7 @@ Packages=
         openssh-server
         pam
         passwd
+        perf
         policycoreutils
         polkit
         procps-ng
diff --git a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot
index 7e4eab9..f1eed03 100755
--- a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot
+++ b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot
@@ -137,6 +137,11 @@ fi
 
 (
     shopt -s nullglob
+    rm -f "$BUILDDIR"/*.deb "$BUILDDIR"/*.ddeb
+
     cp ../*.deb ../*.ddeb "$PACKAGEDIR"
     cp ../*.deb ../*.ddeb "$OUTPUTDIR"
+    cp ../*.deb ../*.ddeb "$BUILDDIR"
+    # These conflict with the packages that we actually want to install, so remove them
+    rm -f "$BUILDDIR"/systemd-standalone-*.deb "$BUILDDIR"/systemd-standalone-*.ddeb
 )
diff --git a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
index ecac780..c6b8154 100644
--- a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
@@ -8,8 +8,8 @@ Distribution=|ubuntu
 Environment=
         GIT_URL=https://salsa.debian.org/systemd-team/systemd.git
         GIT_SUBDIR=debian
-        GIT_BRANCH=debian/master
-        GIT_COMMIT=596a70511736d78c1d8a5a27dca3989806cfa733
+        GIT_BRANCH=ci/v256-stable
+        GIT_COMMIT=5f07b24c429e854db1afad5f14729804a46a59af
 
 VolatilePackages=
         libnss-myhostname
@@ -22,10 +22,12 @@ VolatilePackages=
         systemd
         systemd-container
         systemd-coredump
+        systemd-cryptsetup
         systemd-dev
         systemd-homed
         systemd-journal-remote
         systemd-oomd
+        systemd-repart
         systemd-resolved
         systemd-sysv
         systemd-tests
@@ -41,7 +43,6 @@ Packages=
         ^libubsan[0-9]+$
         apt
         bind9-dnsutils
-        btrfs-progs
         cryptsetup-bin
         dbus-broker
         dbus-user-session
@@ -81,10 +82,11 @@ Packages=
         xxd
 
 InitrdPackages=
-        btrfs-progs
         libclang-rt-dev
         tpm2-tools
 
 InitrdVolatilePackages=
         systemd
+        systemd-cryptsetup
+        systemd-repart
         udev
diff --git a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/10-debug.conf b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/10-debug.conf
index b53b3dc..2bb6164 100644
--- a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/10-debug.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/10-debug.conf
@@ -16,10 +16,12 @@ VolatilePackages=
         systemd-boot-dbgsym
         systemd-container-dbgsym
         systemd-coredump-dbgsym
+        systemd-cryptsetup-dbgsym
         systemd-dbgsym
         systemd-homed-dbgsym
         systemd-journal-remote-dbgsym
         systemd-oomd-dbgsym
+        systemd-repart-dbgsym
         systemd-resolved-dbgsym
         systemd-tests-dbgsym
         systemd-timesyncd-dbgsym
diff --git a/mkosi.images/system/mkosi.conf.d/10-debian/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-debian/mkosi.conf
index c6b6155..50dfa11 100644
--- a/mkosi.images/system/mkosi.conf.d/10-debian/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-debian/mkosi.conf
@@ -2,3 +2,7 @@
 
 [Match]
 Distribution=debian
+
+[Content]
+Packages=
+        linux-perf
diff --git a/mkosi.images/system/mkosi.conf.d/10-fedora/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-fedora/mkosi.conf
index 689fe7d..c4617d2 100644
--- a/mkosi.images/system/mkosi.conf.d/10-fedora/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-fedora/mkosi.conf
@@ -7,10 +7,9 @@ Distribution=fedora
 Environment=
         GIT_URL=https://src.fedoraproject.org/rpms/systemd.git
         GIT_BRANCH=rawhide
-        GIT_COMMIT=1f94b56cee818068f57debfd78f035edd29f0e61
+        GIT_COMMIT=f9fe17dbdee7242ccd4fd2858128c8952890bdb8
 
 Packages=
-        btrfs-progs
         compsize
         dnf5
         f2fs-tools
@@ -18,6 +17,3 @@ Packages=
         # Required for systemd-networkd-tests.py (netdevsim and sch_xxx modules)
         kernel-modules-extra
         kernel-modules-internal
-
-InitrdPackages=
-        btrfs-progs
diff --git a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot
index 3d6cc58..67481d0 100755
--- a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot
+++ b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot
@@ -67,6 +67,9 @@ if ((WIPE)); then
     MKOSI_MESON_OPTIONS="$MKOSI_MESON_OPTIONS --wipe"
 fi
 
+# TODO: Drop when the spec is fixed (either the patch is adapted or not applied when building for upstream).
+sed --in-place '/0009-pid1-handle-console-specificities-weirdness-for-s390.patch/d' "pkg/$ID/systemd.spec"
+
 build() {
     IFS=
     # shellcheck disable=SC2046
@@ -129,4 +132,10 @@ if ! build; then
     build --noprep --nocheck
 fi
 
+(
+    shopt -s nullglob
+    rm -f "$BUILDDIR"/*.rpm
+)
+
 cp "$OUTPUTDIR"/*.rpm "$PACKAGEDIR"
+cp "$OUTPUTDIR"/*.rpm "$BUILDDIR"
diff --git a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf
index 38ae052..e488b2d 100644
--- a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf
@@ -9,8 +9,8 @@ InitrdInclude=initrd/
 [Content]
 Environment=
         GIT_URL=https://src.opensuse.org/rpm/systemd
-        GIT_BRANCH=factory
-        GIT_COMMIT=973534fe1a0a5746ead5bbb6dff8b9ccb9e010982997ed56eba8e44a41c5895d
+        GIT_BRANCH=devel
+        GIT_COMMIT=23bfa9d83b6e24a5395a704b816a351f3dc5b5316e580cacedd1b5d9e068c117
 
 VolatilePackages=
         systemd
@@ -32,7 +32,6 @@ VolatilePackages=
 Packages=
         bind-utils
         bpftool
-        btrfs-progs
         cryptsetup
         device-mapper
         dhcp-server
@@ -62,6 +61,7 @@ Packages=
         openssh-server
         pam
         patterns-base-minimal_base
+        perf
         procps4
         psmisc
         python3-pefile
@@ -86,9 +86,9 @@ Packages=
         veritysetup
         vim
         xz
+        zypper
 
 InitrdPackages=
-        btrfs-progs
         clang
         kmod
         libkmod2
diff --git a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf.d/10-debug.conf b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf.d/10-debug.conf
index 2262eae..6c57d04 100644
--- a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf.d/10-debug.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf.d/10-debug.conf
@@ -9,7 +9,6 @@ VolatilePackages=
         libudev1-debuginfo
         systemd-boot-debuginfo
         systemd-container-debuginfo
-        systemd-coredump-debuginfo
         systemd-debuginfo
         systemd-debugsource
         systemd-experimental-debuginfo
diff --git a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.prepare b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.prepare
index 282a360..c57aa87 100755
--- a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.prepare
+++ b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.prepare
@@ -15,6 +15,9 @@ if [ ! -f "pkg/$ID/systemd.spec" ]; then
     exit 1
 fi
 
+# TODO: Drop when the spec is fixed (either the patch is adapted or not applied when building for upstream).
+sed --in-place '/0009-pid1-handle-console-specificities-weirdness-for-s390.patch/d' "pkg/$ID/systemd.spec"
+
 for DEPS in --requires --buildrequires; do
     mkosi-chroot \
         rpmspec \
diff --git a/mkosi.images/system/mkosi.repart/10-root.conf b/mkosi.images/system/mkosi.repart/10-root.conf
index 715b925..3c25dbf 100644
--- a/mkosi.images/system/mkosi.repart/10-root.conf
+++ b/mkosi.images/system/mkosi.repart/10-root.conf
@@ -2,7 +2,7 @@
 
 [Partition]
 Type=root
-Format=ext4
+Format=btrfs
 CopyFiles=/
 SizeMinBytes=8G
 SizeMaxBytes=8G
diff --git a/mkosi.images/system/mkosi.sync b/mkosi.images/system/mkosi.sync
index d21ecd1..d56ddf5 100755
--- a/mkosi.images/system/mkosi.sync
+++ b/mkosi.images/system/mkosi.sync
@@ -9,20 +9,32 @@ fi
 
 PKG_SUBDIR="$(realpath --canonicalize-missing "pkg/$DISTRIBUTION" --relative-to "$PWD")"
 
-if [[ -d "$PKG_SUBDIR/.git" ]] && [[ "$(git -C "$PKG_SUBDIR" rev-parse HEAD)" == "$GIT_COMMIT" ]]; then
-    exit 0
-fi
+if [[ -d "$PKG_SUBDIR/.git" ]]; then
+    if [[ "$(git -C "$PKG_SUBDIR" rev-parse HEAD)" == "$GIT_COMMIT" ]]; then
+        exit 0
+    fi
 
-# The repository on Salsa has the full upstream sources, so it's a waste of space to
-# redownload and duplicate everything, so do a sparse checkout as we only need the
-# packaging directory anyway
-if [[ -n "${GIT_SUBDIR:-}" ]]; then
-    sparse=(--no-checkout --filter=tree:0)
-else
-    sparse=()
+    # If work is being done on the packaging rules in a separate branch, don't touch the checkout.
+    if ! git -C "$PKG_SUBDIR" merge-base --is-ancestor HEAD "origin/$GIT_BRANCH"; then
+        EXIT_STATUS=$?
+        if [[ $EXIT_STATUS -eq 1 ]]; then
+            exit 0
+        else
+            exit $EXIT_STATUS
+        fi
+    fi
 fi
 
 if [[ ! -e "$PKG_SUBDIR" ]] || [[ -z "$(ls --almost-all "$PKG_SUBDIR")" ]]; then
+    # The repository on Salsa has the full upstream sources, so it's a waste of
+    # space to redownload and duplicate everything, so do a sparse checkout as
+    # we only need the packaging directory anyway.
+    if [[ -n "${GIT_SUBDIR:-}" ]]; then
+        sparse=(--no-checkout --filter=tree:0)
+    else
+        sparse=()
+    fi
+
     git clone "$GIT_URL" --branch "$GIT_BRANCH" "${sparse[@]}" "$PKG_SUBDIR"
     if [[ -n "${GIT_SUBDIR:-}" ]]; then
         # --no-cone is needed to check out only one top-level directory