Merge pull request #33192 from DaanDeMeyer/packaging

mkosi: Various opensuse improvements

mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot

@@ -69,10 +69,6 @@ fi
 
 build() {
     IFS=
-    # TODO: Replace meson_build and meson_install overrides with "--undefine __meson_verbose" once
-    # https://github.com/mesonbuild/meson/pull/12835 is available.
-    # TODO: Replace __meson_auto_features override with meson_extra_configure_options once the suse spec
-    # starts to use it.
     # shellcheck disable=SC2046
     env \
     --unset CFLAGS \
@@ -101,9 +97,8 @@ build() {
         --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" \
-        --define "meson_build %{shrink:%{__meson} compile -C %{_vpath_builddir} -j %{_smp_build_ncpus} $( ((MESON_VERBOSE)) && echo --verbose) %{nil}}" \
-        --define "meson_install %{shrink:DESTDIR=%{buildroot} %{__meson} install -C %{_vpath_builddir} --no-rebuild --quiet %{nil}}" \
-        --define "__meson_auto_features auto $MKOSI_MESON_OPTIONS $MESON_OPTIONS" \
+        $( ((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}" \

mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf

@@ -10,7 +10,7 @@ InitrdInclude=initrd/
 Environment=
         GIT_URL=https://src.opensuse.org/rpm/systemd
         GIT_BRANCH=factory
-        GIT_COMMIT=28c9bef337dd47c88adc1d948cedfdc79c788e2955f17a534bd76da6419722dd
+        GIT_COMMIT=973534fe1a0a5746ead5bbb6dff8b9ccb9e010982997ed56eba8e44a41c5895d
 
 VolatilePackages=
         systemd