diff --git a/gating.yaml b/gating.yaml index 9234236..309384e 100755 --- a/gating.yaml +++ b/gating.yaml @@ -1,6 +1,6 @@ --- !Policy product_versions: - - rhel-9 + - rhel-* decision_context: osci_compose_gate rules: - !PassingTestCaseRule {test_case_name: xen-ci.brew-build.tier1.functional} diff --git a/libguestfs.spec b/libguestfs.spec index c21f5a3..66ef8e2 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -13,14 +13,7 @@ ExcludeArch: %{ix86} # we only do a sanity check that kernel/qemu/libvirt/appliance is not # broken. To perform the full test suite, see instructions here: # https://www.redhat.com/archives/libguestfs/2015-September/msg00078.html -%if !0%{?rhel} %global test_arches aarch64 %{power64} s390x x86_64 -%else -# RHEL 9 only: -# x86-64: "/lib64/libc.so.6: CPU ISA level is lower than required" -# (RHBZ#1919389) -%global test_arches NONE -%endif # Trim older changelog entries. # https://lists.fedoraproject.org/pipermail/devel/2013-April/thread.html#181627 @@ -29,16 +22,8 @@ ExcludeArch: %{ix86} # Verify tarball signature with GPGv2. %global verify_tarball_signature 1 -# If there are patches which touch autotools files, set this to 1. -%if !0%{?rhel} -%global patches_touch_autotools %{nil} -%else -# On RHEL the downstream patches always touch autotools files. -%global patches_touch_autotools 1 -%endif - # The source directory. -%global source_directory 1.52-stable +%global source_directory 1.58-stable # Filter perl provides. %{?perl_default_filter} @@ -49,8 +34,8 @@ ExcludeArch: %{ix86} Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.52.0 -Release: 7%{?dist} +Version: 1.58.0 +Release: 2%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -84,9 +69,7 @@ Source7: libguestfs.keyring # Maintainer script which helps with handling patches. Source8: copy-patches.sh -%if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool, gettext-devel -%endif # Basic build requirements. BuildRequires: gcc, gcc-c++ @@ -111,15 +94,11 @@ BuildRequires: libselinux-utils BuildRequires: libselinux-devel BuildRequires: fuse, fuse-devel BuildRequires: pcre2-devel -BuildRequires: file-devel -BuildRequires: libvirt-devel +BuildRequires: libvirt-devel >= 11.10.0 BuildRequires: gperf -BuildRequires: flex -BuildRequires: bison BuildRequires: rpm-devel BuildRequires: cpio BuildRequires: libconfig-devel -BuildRequires: xz-devel %if !0%{?rhel} BuildRequires: zip BuildRequires: unzip @@ -127,7 +106,7 @@ BuildRequires: unzip BuildRequires: systemd-units BuildRequires: netpbm-progs BuildRequires: icoutils -BuildRequires: libvirt-daemon-kvm >= 7.1.0 +BuildRequires: libvirt-daemon-kvm %if !0%{?rhel} BuildRequires: perl(Expect) %endif @@ -136,29 +115,31 @@ BuildRequires: libcap-devel %if !0%{?rhel} BuildRequires: libldm-devel %endif -BuildRequires: jansson-devel +BuildRequires: json-c-devel BuildRequires: systemd-devel BuildRequires: bash-completion +%if 0%{?fedora} || 0%{?rhel} >= 11 +BuildRequires: bash-completion-devel +%endif BuildRequires: /usr/bin/ping BuildRequires: curl BuildRequires: xz BuildRequires: zstd BuildRequires: libzstd-devel -BuildRequires: /usr/bin/qemu-img +BuildRequires: qemu-img >= 7.2.0 %if 0%{verify_tarball_signature} BuildRequires: gnupg2 %endif # For language bindings. -BuildRequires: ocaml +BuildRequires: ocaml >= 4.08 BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-findlib-devel %if !0%{?rhel} -BuildRequires: ocaml-ounit-devel -%endif BuildRequires: lua BuildRequires: lua-devel +%endif BuildRequires: perl-devel BuildRequires: perl-generators BuildRequires: perl-macros @@ -170,17 +151,17 @@ BuildRequires: perl(ExtUtils::CBuilder) BuildRequires: perl(Locale::TextDomain) BuildRequires: python3-devel BuildRequires: python3-libvirt +%if !0%{?rhel} BuildRequires: ruby-devel BuildRequires: rubygem-rake # json is not pulled in automatically, see RHBZ#1325022 BuildRequires: rubygem(json) BuildRequires: rubygem(rdoc) BuildRequires: rubygem(test-unit) -BuildRequires: ruby-irb +BuildRequires: rubygem(irb) BuildRequires: php-devel BuildRequires: gobject-introspection-devel BuildRequires: gjs -%if !0%{?rhel} BuildRequires: vala %endif %ifarch %{golang_arches} @@ -214,8 +195,8 @@ BuildRequires: e2fsprogs BuildRequires: file BuildRequires: findutils BuildRequires: gawk -BuildRequires: gdisk %if !0%{?rhel} +BuildRequires: gdisk BuildRequires: gfs2-utils %endif BuildRequires: grep @@ -258,12 +239,14 @@ BuildRequires: scrub BuildRequires: sed %if !0%{?rhel} BuildRequires: sleuthkit -%endif BuildRequires: squashfs-tools +%endif BuildRequires: strace +%if !0%{?rhel} %ifarch %{ix86} x86_64 BuildRequires: syslinux syslinux-extlinux %endif +%endif BuildRequires: systemd BuildRequires: tar BuildRequires: udev @@ -274,12 +257,6 @@ BuildRequires: xz %if !0%{?rhel} BuildRequires: zerofree %endif -%if !0%{?rhel} -%ifnarch %{arm} aarch64 s390 s390x riscv64 -# http://zfs-fuse.net/issues/94 -BuildRequires: zfs-fuse -%endif -%endif BuildRequires: zstd # Main package requires the appliance. This allows the appliance to @@ -293,7 +270,7 @@ Requires: (%{name}-appliance = %{epoch}:%{version}-%{release} or %{name}-no # The daemon dependencies are not included automatically, because it # is buried inside the appliance, so list them here. Requires: augeas-libs%{?_isa} >= 1.7.0 -Requires: jansson%{?_isa} +Requires: json-c%{?_isa} Requires: libacl%{?_isa} Requires: libcap%{?_isa} Requires: libselinux%{?_isa} @@ -306,7 +283,7 @@ Requires: systemd-libs%{?_isa} Requires: fuse # For core APIs: -Requires: /usr/bin/qemu-img +Requires: qemu-img Requires: coreutils Requires: grep Requires: tar @@ -315,10 +292,9 @@ Requires: tar Requires: xz # For qemu direct and libvirt backends. -Requires: qemu-kvm-core +Requires: qemu-kvm-core >= 7.2.0 %if !0%{?rhel} Suggests: qemu-block-curl -Suggests: qemu-block-gluster Suggests: qemu-block-iscsi %endif Suggests: qemu-block-rbd @@ -326,10 +302,10 @@ Suggests: qemu-block-rbd Suggests: qemu-block-ssh %endif Recommends: libvirt-daemon-config-network -Requires: libvirt-daemon-driver-qemu >= 7.1.0 +Requires: libvirt-daemon-driver-qemu >= 11.10.0 Requires: libvirt-daemon-driver-secret Requires: libvirt-daemon-driver-storage-core -Recommends: passt +Requires: passt Requires: (selinux-policy >= 3.11.1-63 if selinux-policy) %ifarch aarch64 @@ -375,9 +351,6 @@ For enhanced features, install: libguestfs-ufs adds UFS (BSD) support %endif libguestfs-xfs adds XFS support -%if !0%{?rhel} - libguestfs-zfs adds ZFS support -%endif For developers: @@ -385,17 +358,23 @@ For developers: Language bindings: - libguestfs-gobject-devel GObject bindings and GObject Introspection +%if !0%{?rhel} +libguestfs-gobject-devel GObject bindings and GObject Introspection +%endif %ifarch %{golang_arches} golang-guestfs Go language bindings %endif +%if !0%{?rhel} lua-guestfs Lua bindings +%endif ocaml-libguestfs-devel OCaml bindings perl-Sys-Guestfs Perl bindings - php-libguestfs PHP bindings - python3-libguestfs Python 3 bindings - ruby-libguestfs Ruby bindings %if !0%{?rhel} + php-libguestfs PHP bindings +%endif + python3-libguestfs Python 3 bindings +%if !0%{?rhel} + ruby-libguestfs Ruby bindings libguestfs-vala Vala language bindings %endif @@ -502,20 +481,6 @@ This adds XFS support to %{name}. Install it if you want to process disk images containing XFS. -%if !0%{?rhel} -%ifnarch %{arm} aarch64 s390 s390x riscv64 -%package zfs -Summary: ZFS support for %{name} -License: GPL-2.0-or-later -Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} - -%description zfs -This adds ZFS support to %{name}. Install it if you want to process -disk images containing ZFS. -%endif -%endif - - %package inspect-icons Summary: Additional dependencies for inspecting guest icons License: LGPL-2.1-or-later @@ -589,6 +554,7 @@ Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} python3-%{name} contains Python 3 bindings for %{name}. +%if !0%{?rhel} %package -n ruby-%{name} Summary: Ruby bindings for %{name} Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} @@ -641,7 +607,6 @@ This package is needed if you want to write software using the GObject bindings. It also contains GObject Introspection information. -%if !0%{?rhel} %package vala Summary: Vala for %{name} Requires: %{name}-devel%{?_isa} = %{epoch}:%{version}-%{release} @@ -696,9 +661,10 @@ for %{name}. %setup -q %autopatch -p1 -%if 0%{patches_touch_autotools} -autoreconf -i -%endif +# ACLOCAL_PATH is temporarily required to work around +# https://bugzilla.redhat.com/show_bug.cgi?id=2366708 +export ACLOCAL_PATH=/usr/share/gettext/m4/ +autoreconf -fiv # For sVirt to work, the local temporary directory we use in the tests # must be labelled the same way as /tmp. This doesn't work if either @@ -757,6 +723,12 @@ fi %endif --without-java \ --disable-erlang \ +%if 0%{?rhel} + --disable-gobject \ + --disable-lua \ + --disable-php \ + --disable-ruby \ +%endif $extra # 'INSTALLDIRS' ensures that Perl and Ruby libs are installed in the @@ -781,6 +753,15 @@ if ! make quickcheck QUICKCHECK_TEST_TOOL_ARGS="-t 1200"; then cat $HOME/.cache/libvirt/qemu/log/* exit 1 fi + +# As libvirt is the default backend, test that the direct backend +# works too. It's a good place to get test coverage across all the +# architectures. +if ! LIBGUESTFS_BACKEND=direct \ + make quickcheck QUICKCHECK_TEST_TOOL_ARGS="-t 1200"; then + cat $HOME/.cache/libvirt/qemu/log/* + exit 1 +fi %endif @@ -801,6 +782,10 @@ find $RPM_BUILD_ROOT -name .packlist -delete find $RPM_BUILD_ROOT -name '*.bs' -delete find $RPM_BUILD_ROOT -name 'bindtests.pl' -delete +# debuginfo generation fails with debugedit >= 5.1 unless the files +# are writable: +find $RPM_BUILD_ROOT -name Guestfs.so -exec chmod u+w {} \; + # golang: Ignore what libguestfs upstream installs, and just copy the # source files to %%{_datadir}/gocode/src. %ifarch %{golang_arches} @@ -846,13 +831,6 @@ move_to strace zz-packages-rescue move_to vim-minimal zz-packages-rescue move_to rsync zz-packages-rsync move_to xfsprogs zz-packages-xfs -%if !0%{?rhel} -%ifnarch %{arm} aarch64 s390 s390x riscv64 -move_to zfs-fuse zz-packages-zfs -%endif -%else -remove zfs-fuse -%endif %if !0%{?rhel} # On Fedora you need kernel-modules-extra to be able to mount @@ -970,19 +948,23 @@ rm ocaml/html/.gitignore %files xfs %{_libdir}/guestfs/supermin.d/zz-packages-xfs -%if !0%{?rhel} -%ifnarch %{arm} aarch64 s390 s390x riscv64 -%files zfs -%{_libdir}/guestfs/supermin.d/zz-packages-zfs -%endif -%endif - - %files inspect-icons # no files %files bash-completion +%if 0%{?fedora} || 0%{?rhel} >= 11 +%dir %{bash_completions_dir} +%{bash_completions_dir}/guestfish +%{bash_completions_dir}/guestmount +%{bash_completions_dir}/guestunmount +%{bash_completions_dir}/libguestfs-test-tool +%{bash_completions_dir}/virt-copy-in +%{bash_completions_dir}/virt-copy-out +%{bash_completions_dir}/virt-rescue +%{bash_completions_dir}/virt-tar-in +%{bash_completions_dir}/virt-tar-out +%else %dir %{_datadir}/bash-completion/completions %{_datadir}/bash-completion/completions/guestfish %{_datadir}/bash-completion/completions/guestmount @@ -993,6 +975,7 @@ rm ocaml/html/.gitignore %{_datadir}/bash-completion/completions/virt-rescue %{_datadir}/bash-completion/completions/virt-tar-in %{_datadir}/bash-completion/completions/virt-tar-out +%endif %files -n ocaml-%{name} @@ -1033,6 +1016,7 @@ rm ocaml/html/.gitignore %{_mandir}/man3/guestfs-python.3* +%if !0%{?rhel} %files -n ruby-%{name} %doc ruby/examples/*.rb %doc ruby/doc/site/* @@ -1070,7 +1054,6 @@ rm ocaml/html/.gitignore %{_mandir}/man3/guestfs-gobject.3* -%if !0%{?rhel} %files vala %{_datadir}/vala/vapi/libguestfs-gobject-1.0.deps %{_datadir}/vala/vapi/libguestfs-gobject-1.0.vapi @@ -1099,6 +1082,210 @@ rm ocaml/html/.gitignore %changelog +* Thu Jan 08 2026 Mamoru TASAKA - 1:1.58.0-2 +- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_4.0 + +* Mon Jan 05 2026 Richard W.M. Jones - 1:1.58.0-1 +- New upstream development version 1.58.0 +- Require libvirt >= 11.10.0, qemu >= 7.2.0 and passt. + +* Wed Dec 17 2025 Tom Callaway - 1:1.57.7-2 +- rebuild for new libconfig + +* Thu Dec 04 2025 Richard W.M. Jones - 1:1.57.7-1 +- New upstream development version 1.57.7 + +* Tue Nov 04 2025 Richard W.M. Jones - 1:1.57.6-1 +- New upstream development version 1.57.6 + +* Fri Oct 17 2025 Richard W.M. Jones - 1:1.57.5-1 +- New upstream development version 1.57.5 +- Test direct backend in %%check + +* Wed Oct 15 2025 Richard W.M. Jones - 1:1.57.4-4 +- Require passt +- https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/YDHKKQSDURTMSKSN6GW3QGQI43DTFXNH/ + +* Wed Oct 15 2025 Remi Collet - 1:1.57.4-3 +- rebuild for https://fedoraproject.org/wiki/Changes/php85 + +* Mon Oct 13 2025 Richard W.M. Jones - 1:1.57.4-2 +- OCaml 5.4.0 rebuild + +* Tue Sep 30 2025 Richard W.M. Jones - 1:1.57.4-1 +- New upstream development version 1.57.4 +- Enable aarch64 tests + +* Fri Sep 19 2025 Python Maint - 1:1.57.3-2 +- Rebuilt for Python 3.14.0rc3 bytecode + +* Tue Sep 09 2025 Richard W.M. Jones - 1:1.57.3-1 +- New upstream development version 1.57.3 + +* Fri Aug 15 2025 Python Maint - 1:1.57.2-2 +- Rebuilt for Python 3.14.0rc2 bytecode + +* Fri Aug 15 2025 Richard W.M. Jones - 1:1.57.2-1 +- New upstream development version 1.57.2 + +* Wed Aug 13 2025 Richard W.M. Jones - 1:1.57.1-1 +- New upstream development version 1.57.1 + +* Thu Jul 24 2025 Fedora Release Engineering - 1:1.56.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sat Jul 12 2025 Jerry James - 1:1.56.1-3 +- Rebuild to fix OCaml dependencies + +* Mon Jul 07 2025 Jitka Plesnikova - 1:1.56.1-2 +- Perl 5.42 rebuild + +* Mon Jun 16 2025 Richard W.M. Jones - 1:1.56.1-1 +- New upstream stable version 1.56.1 +- Remove upstream ACPI / seabios fixes included in this version. + +* Wed Jun 11 2025 Richard W.M. Jones - 1:1.56.0-1 +- New upstream stable version 1.56.0 +- Remove BR xz-devel as it is not needed. + +* Fri Jun 06 2025 Python Maint - 1:1.55.14-2 +- Rebuilt for Python 3.14 + +* Tue Jun 03 2025 Richard W.M. Jones - 1:1.55.14-1 +- New upstream development version 1.55.14 + +* Mon Jun 02 2025 Python Maint - 1:1.55.13-2 +- Rebuilt for Python 3.14 + +* Tue May 20 2025 Richard W.M. Jones - 1:1.55.13-1 +- New upstream development version 1.55.13 + +* Mon May 19 2025 Richard W.M. Jones - 1:1.55.12-1 +- New upstream development version 1.55.12 + +* Fri May 09 2025 Richard W.M. Jones - 1:1.55.11-2 +- New upstream development version 1.55.11 +- Backport upstream patch to really remove zfs-fuse dependency + +* Wed May 07 2025 Richard W.M. Jones - 1:1.55.10-2 +- Remove file-devel BR +- Remove libguestfs-zfs subpackage + +* Sat Apr 26 2025 Richard W.M. Jones - 1:1.55.10-1 +- New upstream development version 1.55.10 +- Fix macro in comment + +* Wed Apr 16 2025 Richard W.M. Jones - 1:1.55.9-1 +- New upstream development version 1.55.9 +- Remove flex and bison + +* Thu Apr 03 2025 Richard W.M. Jones - 1:1.55.8-1 +- New upstream development version 1.55.8 +- Remove oUnit + +* Tue Mar 11 2025 Richard W.M. Jones - 1:1.55.7-1 +- New upstream development version 1.55.7 + +* Wed Feb 19 2025 Richard W.M. Jones - 1:1.55.6-1 +- New upstream development version 1.55.6 + +* Tue Feb 18 2025 Richard W.M. Jones - 1:1.55.5-1 +- New upstream development version 1.55.5 + +* Wed Feb 05 2025 Richard W.M. Jones - 1:1.55.4-1 +- New upstream development version 1.55.4 + +* Fri Jan 17 2025 Fedora Release Engineering - 1:1.55.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Sun Jan 12 2025 Zbigniew Jędrzejewski-Szmek - 1:1.55.3-4 +- Rebuilt for the bin-sbin merge (2nd attempt) + +* Fri Jan 10 2025 Jerry James - 1:1.55.3-3 +- OCaml 5.3.0 rebuild for Fedora 42 + +* Thu Jan 09 2025 Richard W.M. Jones - 1:1.55.3-2 +- Rebuild for Ruby 3.4 again (RHBZ#2336525) + +* Wed Jan 08 2025 Richard W.M. Jones - 1:1.55.3-1 +- New upstream development version 1.55.3 +- Baseline version of OCaml moved to 4.08 + +* Wed Jan 08 2025 Mamoru TASAKA - 1:1.55.2-2 +- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.4 + +* Mon Nov 18 2024 Richard W.M. Jones - 1:1.55.2-1 +- New upstream development version 1.55.2 + +* Tue Oct 22 2024 Richard W.M. Jones - 1:1.55.1-1 +- New upstream development version 1.55.1 +- Replace jansson with json-c + +* Tue Oct 22 2024 Richard W.M. Jones - 1:1.54.0-4 +- Rebuild for Jansson 2.14 + (https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/3PYINSQGKQ4BB25NQUI2A2UCGGLAG5ND/) + +* Mon Oct 21 2024 Richard W.M. Jones - 1:1.54.0-3 +- Use stable owner, group and mtime in appliance tarballs (RHBZ#2320025) +- Add support for Windows Server 2025 + +* Mon Oct 14 2024 Remi Collet - 1:1.54.0-2 +- rebuild for https://fedoraproject.org/wiki/Changes/php84 + +* Tue Oct 08 2024 Richard W.M. Jones - 1:1.54.0-1 +- New upstream stable version 1.54.0 + +* Thu Oct 03 2024 Richard W.M. Jones - 1:1.53.7-1 +- New upstream development version 1.53.7 + +* Fri Aug 16 2024 Richard W.M. Jones - 1:1.53.6-1 +- New upstream development version 1.53.6 +- Fix kernel hang (RHBZ#2303267) + +* Thu Jul 18 2024 Fedora Release Engineering - 1:1.53.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed Jul 10 2024 Zbigniew Jędrzejewski-Szmek - 1:1.53.5-2 +- Rebuilt for the bin-sbin merge + +* Mon Jul 08 2024 Richard W.M. Jones - 1:1.53.5-1 +- New upstream development version 1.53.5 + +* Fri Jun 28 2024 Richard W.M. Jones - 1:1.53.4-1 +- New upstream development version 1.53.4 + +* Thu Jun 27 2024 Richard W.M. Jones - 1:1.53.3-1 +- New upstream development version 1.53.3 +- Remove glusterfs support. + +* Wed Jun 19 2024 Richard W.M. Jones - 1:1.53.2-6 +- OCaml 5.2.0 ppc64le fix + +* Wed Jun 12 2024 Jitka Plesnikova - 1:1.53.2-5 +- Perl 5.40 rebuild + +* Mon Jun 10 2024 Python Maint - 1:1.53.2-4 +- Rebuilt for Python 3.13 + +* Fri May 31 2024 Richard W.M. Jones - 1:1.53.2-3 +- Re-enable perl in RHEL, needed for virt-win-reg. + +* Wed May 29 2024 Richard W.M. Jones - 1:1.53.2-2 +- OCaml 5.2.0 for Fedora 41 + +* Fri May 10 2024 Richard W.M. Jones - 1:1.53.2-1 +- New upstream development version 1.53.2 +- Remove gdisk dependency for RHEL + (https://issues.redhat.com/browse/RHEL-35998) +- Remove lua, perl, ruby, php and gobject bindings in RHEL + +* Thu Apr 25 2024 Richard W.M. Jones - 1:1.53.1-1 +- New upstream development version 1.53.1 + +* Mon Mar 25 2024 Richard W.M. Jones - 1:1.52.0-8 +- Use %%{bash_completions_dir} macro +- BR bash-completion-devel, new in Rawhide + * Thu Jan 25 2024 Fedora Release Engineering - 1:1.52.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/rpminspect.yaml b/rpminspect.yaml new file mode 100644 index 0000000..ba87399 --- /dev/null +++ b/rpminspect.yaml @@ -0,0 +1,5 @@ +# Ignore copy-patches.sh. It is an internal script we use to +# manage the patches. +upstream: + ignore: + - copy-patches.sh diff --git a/sources b/sources index efde8ee..23cf369 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libguestfs-1.52.0.tar.gz) = 48dfaabb6b371ab3476b42310d363addf2fd1dfe43876be3bc984953f6919a30c7de13ef235d83fdd39117d71aa6bbfb5fbb645c1b17bc3031798a2a2b3df9d7 -SHA512 (libguestfs-1.52.0.tar.gz.sig) = c147e3b894c65137145228d70bcda3975a4dd4faa04c066d6783799e3d4825c2eee7c093601002f3a352989d81a75dd63c754f149201921abdded96ecb7a6214 +SHA512 (libguestfs-1.58.0.tar.gz) = 67abbd37fe64935ae5cca13dbe1860fe2eab9df492fd134eacbdc1831e6034c849855e76118ce0002d3ac83205122947582dbe47b66f12b94dcb51155881501a +SHA512 (libguestfs-1.58.0.tar.gz.sig) = e07758ed3901f9ae95dace16cbb4de194dbbde788155efcde7982226785928d1805af6939f201d74770923ad55997f1d465f9594cb81bc2435c0ea882ce546d8 diff --git a/tests/run-libguestfs-test-tool.sh b/tests/run-libguestfs-test-tool.sh new file mode 100755 index 0000000..d36d5ea --- /dev/null +++ b/tests/run-libguestfs-test-tool.sh @@ -0,0 +1,10 @@ +#!/bin/bash - +set -e +set -x + +# This only makes sure that libguestfs isn't totally broken. + +# Fix libvirt. +systemctl restart virtqemud virtsecretd virtstoraged virtnetworkd + +libguestfs-test-tool diff --git a/tests/tests.yml b/tests/tests.yml index 180fe76..3809111 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -5,9 +5,10 @@ - role: standard-test-basic tags: - classic + required_packages: + - libguestfs + - libvirt-daemon-kvm tests: - libguestfs-test-tool: dir: . - run: libguestfs-test-tool - required_packages: - - libguestfs + run: ./run-libguestfs-test-tool.sh