Merging upstream version 256.4.

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

5 files changed, 0 insertions, 333 deletions

diff --git a/mkosi.images/system/mkosi.conf.d/10-opensuse/initrd/mkosi.postinst b/mkosi.images/system/mkosi.conf.d/10-opensuse/initrd/mkosi.postinst
deleted file mode 100755
index 417132f..0000000
--- a/mkosi.images/system/mkosi.conf.d/10-opensuse/initrd/mkosi.postinst
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-# SPDX-License-Identifier: LGPL-2.1-or-later
-set -e
-
-# OpenSUSE insists on blacklisting erofs by default because its supposedly a legacy filesystem.
-# See https://github.com/openSUSE/suse-module-tools/pull/71
-rm -f "$BUILDROOT/usr/lib/modprobe.d/60-blacklist_fs-erofs.conf"
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
deleted file mode 100755
index 67481d0..0000000
--- a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot
+++ /dev/null
@@ -1,141 +0,0 @@
-#!/bin/bash
-# SPDX-License-Identifier: LGPL-2.1-or-later
-set -e
-
-if ((NO_BUILD)); then
-    exit 0
-fi
-
-# shellcheck source=/dev/null
-. /usr/lib/os-release
-ID="${ID%-*}"
-
-if [ ! -f "pkg/$ID/systemd.spec" ]; then
-    echo "spec not found at pkg/$ID/systemd.spec, run mkosi once with -ff to make sure the spec is cloned" >&2
-    exit 1
-fi
-
-if [ -d .git/ ] && [ -z "$(git status --porcelain)" ]; then
-    TS="$(git show --no-patch --format=%ct HEAD)"
-else
-    TS="${SOURCE_DATE_EPOCH:-$(date +%s)}"
-fi
-
-# The openSUSE filelists hardcode the manpage compression extension. This causes rpmbuild errors since we
-# disable manpage compression as the files cannot be found. Fix the issue by removing the compression
-# extension.
-find "pkg/$ID" -name "files.*" -exec sed --in-place 's/\.gz$//' {} \;
-
-if systemd-analyze compare-versions "$(rpm --version | cut -d ' ' -f3)" lt "4.20"; then
-    # Fix the %install override so debuginfo packages are generated.
-    tee --append /usr/lib/rpm/suse/macros <<'EOF'
-%install %{debug_package}\
-%%install\
-%{nil}
-EOF
-fi
-
-VERSION="$(cat meson.version)"
-RELEASE="$(date "+%Y%m%d%H%M%S" --date "@$TS")"
-
-DIST="$(rpm --eval %dist)"
-ARCH="$(rpm --eval %_arch)"
-SRCDEST="/usr/src/debug/systemd-$VERSION-${RELEASE}${DIST}.$ARCH"
-
-MKOSI_CFLAGS="-O0 -Wp,-U_FORTIFY_SOURCE"
-if ((WITH_DEBUG)); then
-    MKOSI_CFLAGS="$MKOSI_CFLAGS -fdebug-prefix-map=../src=$SRCDEST"
-fi
-if ((LLVM)); then
-    # TODO: Remove -fno-sanitize-function when https://github.com/systemd/systemd/issues/29972 is fixed.
-    MKOSI_CFLAGS="$MKOSI_CFLAGS -shared-libasan -fno-sanitize=function"
-fi
-
-MKOSI_LDFLAGS="$(rpm --eval "%{?build_ldflags}")"
-if ((LLVM)) && [[ -n "$SANITIZERS" ]]; then
-    MKOSI_LDFLAGS="$MKOSI_LDFLAGS -Wl,-rpath=$(clang --print-file-name="")lib/linux"
-fi
-
-# A macro can't have an empty body and currently opensuse does not specify any of its own linker flags so
-# set LDFLAGS to %{nil} if there are no linker flags.
-if [[ -z "${MKOSI_LDFLAGS// }" ]]; then
-    MKOSI_LDFLAGS="%{nil}"
-fi
-
-MKOSI_MESON_OPTIONS="-D mode=developer -D b_sanitize=${SANITIZERS:-none}"
-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
-    env \
-    --unset CFLAGS \
-    --unset CXXFLAGS \
-    --unset LDFLAGS \
-    CC="$( ((LLVM)) && echo clang || echo gcc)" \
-    CXX="$( ((LLVM)) && echo clang++ || echo g++)" \
-    CC_LD="$( ((LLVM)) && echo lld)" \
-    CXX_LD="$( ((LLVM)) && echo lld)" \
-    rpmbuild \
-        -bb \
-        --build-in-place \
-        --with upstream \
-        $( ((WITH_TESTS)) || echo "--nocheck") \
-        --define "_topdir /var/tmp" \
-        --define "_sourcedir pkg/$ID" \
-        --define "_rpmdir $OUTPUTDIR" \
-        ${BUILDDIR:+"--define=_vpath_builddir $BUILDDIR"} \
-        --define "_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" \
-        --define "_binary_payload w.ufdio" \
-        $( ((WITH_DEBUG)) || echo "--define=debug_package %{nil}") \
-        --define "vendor openSUSE" \
-        --define "version_override $VERSION" \
-        --define "release_override $RELEASE" \
-        --define "__check_files sh -c '$(rpm --define "_topdir /var/tmp" --eval %__check_files) | tee /tmp/unpackaged-files'" \
-        --define "build_cflags $(rpm --eval "%{?build_cflags}") $MKOSI_CFLAGS $CFLAGS" \
-        --define "build_cxxflags $(rpm --eval "%{?build_cxxflags}") $MKOSI_CFLAGS $CFLAGS" \
-        --define "build_ldflags $MKOSI_LDFLAGS $LDFLAGS" \
-        $( ((MESON_VERBOSE)) || echo "--undefine=__meson_verbose") \
-        --define "meson_extra_configure_options $MKOSI_MESON_OPTIONS $MESON_OPTIONS" \
-        --define "__os_install_post /usr/lib/rpm/brp-suse %{nil}" \
-        --define "__elf_exclude_path ^/usr/lib/systemd/tests/unit-tests/.*$" \
-        --define "__script_requires %{nil}" \
-        --define "_find_debuginfo_dwz_opts %{nil}" \
-        --define "_fixperms true" \
-        --noclean \
-        "$@" \
-        "pkg/$ID/systemd.spec"
-
-    EXIT_STATUS=$?
-
-    # Make sure we don't reconfigure twice.
-    MKOSI_MESON_OPTIONS="${MKOSI_MESON_OPTIONS//"--wipe"/}"
-
-    return $EXIT_STATUS
-}
-
-if ! build; then
-    if [ ! -s /tmp/unpackaged-files ]; then
-        exit 1
-    fi
-
-    # rpm will append to any existing systemd.lang so delete it explicitly so we don't get duplicate file
-    # warnings.
-    rm systemd.lang
-
-    grep -v ".debug" /tmp/unpackaged-files >>"pkg/$ID/files.systemd"
-    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
deleted file mode 100644
index e488b2d..0000000
--- a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf
+++ /dev/null
@@ -1,100 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Match]
-Distribution=opensuse
-
-[Config]
-InitrdInclude=initrd/
-
-[Content]
-Environment=
-        GIT_URL=https://src.opensuse.org/rpm/systemd
-        GIT_BRANCH=devel
-        GIT_COMMIT=23bfa9d83b6e24a5395a704b816a351f3dc5b5316e580cacedd1b5d9e068c117
-
-VolatilePackages=
-        systemd
-        systemd-boot
-        systemd-container
-        systemd-devel
-        systemd-doc
-        systemd-experimental
-        systemd-homed
-        systemd-lang
-        systemd-network
-        systemd-portable
-        systemd-sysvcompat
-        systemd-testsuite
-        udev
-
-# We install gawk, gzip, grep, xz, sed, rsync and docbook-xsl-stylesheets here explicitly so that the busybox
-# versions don't get installed instead.
-Packages=
-        bind-utils
-        bpftool
-        cryptsetup
-        device-mapper
-        dhcp-server
-        docbook-xsl-stylesheets
-        f2fs-tools
-        gawk
-        gcc-c++
-        git-core
-        glibc-locale-base
-        gnutls
-        grep
-        group(bin)
-        group(daemon)
-        group(games)
-        group(nobody)
-        group(root)
-        gzip
-        iputils
-        kernel-default
-        kmod
-        libasan8
-        libkmod2
-        libubsan1
-        multipath-tools
-        open-iscsi
-        openssh-clients
-        openssh-server
-        pam
-        patterns-base-minimal_base
-        perf
-        procps4
-        psmisc
-        python3-pefile
-        python3-pexpect
-        python3-psutil
-        quota
-        rpm-build
-        rsync
-        sbsigntools
-        sed
-        shadow
-        softhsm
-        squashfs
-        tgt
-        timezone
-        tpm2.0-tools
-        user(bin)
-        user(daemon)
-        user(games)
-        user(nobody)
-        user(root)
-        veritysetup
-        vim
-        xz
-        zypper
-
-InitrdPackages=
-        clang
-        kmod
-        libkmod2
-        tpm2.0-tools
-
-InitrdVolatilePackages=
-        systemd
-        udev
-        systemd-experimental
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
deleted file mode 100644
index 6c57d04..0000000
--- a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf.d/10-debug.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Match]
-Environment=WITH_DEBUG=1
-
-[Content]
-VolatilePackages=
-        libsystemd0-debuginfo
-        libudev1-debuginfo
-        systemd-boot-debuginfo
-        systemd-container-debuginfo
-        systemd-debuginfo
-        systemd-debugsource
-        systemd-experimental-debuginfo
-        systemd-homed-debuginfo
-        systemd-journal-remote-debuginfo
-        systemd-network-debuginfo
-        systemd-portable-debuginfo
-        systemd-sysvcompat-debuginfo
-        systemd-testsuite-debuginfo
-        udev-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
deleted file mode 100755
index c57aa87..0000000
--- a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.prepare
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/bash
-# SPDX-License-Identifier: LGPL-2.1-or-later
-set -e
-
-if [ "$1" = "build" ] || ((NO_BUILD)); then
-    exit 0
-fi
-
-# shellcheck source=/dev/null
-. "$BUILDROOT/usr/lib/os-release"
-ID="${ID%-*}"
-
-if [ ! -f "pkg/$ID/systemd.spec" ]; then
-    echo "spec not found at pkg/$ID/systemd.spec, run mkosi once with -ff to make sure the spec is cloned" >&2
-    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 \
-        --with upstream \
-        --query \
-        "$DEPS" \
-        --define "_topdir /var/tmp" \
-        --define "_sourcedir pkg/$ID" \
-        "pkg/$ID/systemd.spec" |
-            grep --invert-match --regexp systemd --regexp /bin/sh --regexp "rpmlib(" --regexp udev |
-            sort --unique |
-            tee /tmp/buildrequires |
-            xargs --delimiter '\n' mkosi-install
-done
-
-until mkosi-chroot \
-    rpmbuild \
-    -bd \
-    --build-in-place \
-    --with upstream \
-    --define "_topdir /var/tmp" \
-    --define "_sourcedir pkg/$ID" \
-    --define "_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" \
-    "pkg/$ID/systemd.spec"
-do
-    EXIT_STATUS=$?
-    if [ $EXIT_STATUS -ne 11 ]; then
-        exit $EXIT_STATUS
-    fi
-
-    mkosi-chroot \
-        rpm \
-        --query \
-        --package \
-        --requires \
-        /var/tmp/SRPMS/systemd-*.buildreqs.nosrc.rpm |
-            grep --invert-match '^rpmlib(' |
-            sort --unique >/tmp/dynamic-buildrequires
-
-    sort /tmp/buildrequires /tmp/dynamic-buildrequires |
-        uniq --unique |
-        tee --append /tmp/buildrequires |
-        xargs --delimiter '\n' mkosi-install
-done