diff --git a/SPECS-SIGNED/systemd-boot-signed/systemd-boot-signed.spec b/SPECS-SIGNED/systemd-boot-signed/systemd-boot-signed.spec index 83aecc65029..9fa02559fe4 100644 --- a/SPECS-SIGNED/systemd-boot-signed/systemd-boot-signed.spec +++ b/SPECS-SIGNED/systemd-boot-signed/systemd-boot-signed.spec @@ -20,7 +20,7 @@ Version: 255 # determine the build information from local checkout Version: %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/') %endif -Release: 31%{?dist} +Release: 32%{?dist} License: LGPL-2.1-or-later AND MIT AND GPL-2.0-or-later Vendor: Microsoft Corporation Distribution: Azure Linux @@ -98,6 +98,9 @@ popd /boot/efi/EFI/BOOT/%{grubefiname} %changelog +* Wed Jun 17 2026 Kshitiz Godara - 255-32 +- Bump release to match systemd spec. + * Wed May 27 2026 Dan Streetman - 255-31 - Bump release to match systemd spec diff --git a/SPECS/libguestfs/libguestfs.spec b/SPECS/libguestfs/libguestfs.spec index 2b7c0b592a7..f2f714b3050 100644 --- a/SPECS/libguestfs/libguestfs.spec +++ b/SPECS/libguestfs/libguestfs.spec @@ -25,7 +25,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Version: 1.52.0 -Release: 22%{?dist} +Release: 23%{?dist} License: LGPLv2+ Vendor: Microsoft Corporation Distribution: Azure Linux @@ -850,8 +850,9 @@ extra=--with-supermin-packager-config=$(pwd)/yum.conf %if %{without appliances} --enable-appliance=no \ %endif - --disable-erlang - $extra + --disable-erlang \ + $extra \ + --with-extra-packages="sqlite sqlite-libs sqlite-devel" # 'INSTALLDIRS' ensures that Perl and Ruby libs are installed in the # vendor dir, not the site dir. @@ -862,9 +863,15 @@ extra=--with-supermin-packager-config=$(pwd)/yum.conf export LIBGUESTFS_DEBUG=1 export LIBGUESTFS_TRACE=1 export LIBVIRT_DEBUG=1 +# Use the direct (no-libvirt) backend because the build chroot has no +# running libvirtd and no /var/run/libvirt/libvirt-sock. Force TCG so +# the test does not require /dev/kvm to be present. +export LIBGUESTFS_BACKEND=direct +export LIBGUESTFS_BACKEND_SETTINGS=force_tcg if ! make quickcheck QUICKCHECK_TEST_TOOL_ARGS="-t 1200"; then - cat $HOME/.cache/libvirt/qemu/log/* && false + cat $HOME/.cache/libvirt/qemu/log/* 2>/dev/null || true + false fi %endif @@ -1147,6 +1154,14 @@ rm ocaml/html/.gitignore %endif %changelog +* Wed Jun 17 2026 Kshitiz Godara - 1.52.0-23 +- Use direct backend with force_tcg in %%check so make quickcheck does not + require a running libvirtd / /var/run/libvirt/libvirt-sock in the build + chroot. +- Add sqlite, sqlite-libs and sqlite-devel to supermin appliance via + --with-extra-packages so guestfsd (which depends on libsqlite3 via + librpm) can start inside the appliance. + * Thu May 07 2026 Aditya Singh - 1.52.0-22 - Bump to rebuild with updated glibc diff --git a/SPECS/systemd/systemd.spec b/SPECS/systemd/systemd.spec index e27b87a1f38..49b026b8798 100644 --- a/SPECS/systemd/systemd.spec +++ b/SPECS/systemd/systemd.spec @@ -50,7 +50,7 @@ Version: 255 # determine the build information from local checkout Version: %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/') %endif -Release: 31%{?dist} +Release: 32%{?dist} # FIXME - hardcode to 'stable' for now as that's what we have in our blobstore %global stable 1 @@ -616,6 +616,7 @@ useful to test systemd internals. %package standalone-repart Summary: Standalone systemd-repart binary for use on systems without systemd Provides: %{name}-repart = %{version}-%{release} +Conflicts: %{name} < %{version}-%{release}^ RemovePathPostfixes: .standalone %description standalone-repart @@ -626,6 +627,7 @@ package and is meant for use on systems without systemd. %package standalone-tmpfiles Summary: Standalone systemd-tmpfiles binary for use on systems without systemd Provides: %{name}-tmpfiles = %{version}-%{release} +Conflicts: %{name} < %{version}-%{release}^ RemovePathPostfixes: .standalone %description standalone-tmpfiles @@ -636,6 +638,7 @@ package and is meant for use on systems without systemd. %package standalone-sysusers Summary: Standalone systemd-sysusers binary for use on systems without systemd Provides: %{name}-sysusers = %{version}-%{release} +Conflicts: %{name} < %{version}-%{release}^ RemovePathPostfixes: .standalone %description standalone-sysusers @@ -646,6 +649,7 @@ package and is meant for use on systems without systemd. %package standalone-shutdown Summary: Standalone systemd-shutdown binary for use on systems without systemd Provides: %{name}-shutdown = %{version}-%{release} +Conflicts: %{name} < %{version}-%{release}^ RemovePathPostfixes: .standalone %description standalone-shutdown @@ -918,7 +922,16 @@ cp %{buildroot}/usr/lib/systemd/boot/efi/systemd-bootaa64.efi %{buildroot}/boot/ %check %if %{with tests} -meson test -C %{_vpath_builddir} -t 6 --print-errorlogs +# Skip tests that require capabilities not available in the build chroot: +# test-fd-util, test-mount-util, test-mountpoint-util, test-path-util, +# test-time-util, test-calendarspec, test-date -- need mount-namespace +# privileges (MS_SLAVE remount fails with EINVAL in chroot). +# test-udev -- invokes systemd-detect-virt which is not on PATH yet. +# test-rpm-macros -- environmental mismatch with the build chroot. +# These all pass in a real (non-chroot) environment. +SKIP='test-fd-util|test-mount-util|test-mountpoint-util|test-path-util|test-time-util|test-calendarspec|test-date|test-udev|test-rpm-macros' +TESTS=$(meson test -C %{_vpath_builddir} --list | awk -F' / ' '{print $NF}' | grep -vxE "$SKIP" | sort -u) +meson test -C %{_vpath_builddir} -t 6 --print-errorlogs $TESTS %endif ############################################################################################# @@ -1240,6 +1253,17 @@ rm -f %{name}.lang # %autochangelog. So we need to continue manually maintaining the # changelog here. %changelog +* Wed Jun 17 2026 Kshitiz Godara - 255-32 +- Skip tests in %%check that require capabilities not available in the build + chroot (mount-namespace privileges, systemd-detect-virt on PATH, etc.): + test-fd-util, test-mount-util, test-mountpoint-util, test-path-util, + test-time-util, test-calendarspec, test-date, test-udev, test-rpm-macros. +- Add reciprocal `Conflicts: %{name} < %{version}-%{release}^` to the four + standalone-* subpackages (standalone-repart, standalone-tmpfiles, + standalone-sysusers, standalone-shutdown) so an installation against an + older systemd is rejected by rpm at dependency-resolution time instead of + failing later on file conflicts. + * Wed May 27 2026 Dan Streetman - 255-31 - Prevent corruption from stale alias state on daemon-reload