From c24e0f2ae18c2716610a7b991bb45ccfb35b1fe3 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 25 Mar 2021 08:40:26 +0000 Subject: [PATCH] Add perl(Test::More) dependency for the Perl test suite. Fix ounit2 dependency again. --- ...dfiles-Fix-bogus-directories-in-this-file.patch | 2 +- ...-t-try-to-install-.3-and-.5-files-which-d.patch | 2 +- ...emove-dependency-on-gobject-introspection.patch | 2 +- ...-build-Remove-dependency-on-perl-Sys-Virt.patch | 2 +- ...-rid-of-etc-xdg-and-XDG_CONFIG_DIRS-nonse.patch | 2 +- .../0006-builder-Use-correct-ounit2-module.patch | 2 +- .../0007-Update-common-submodule-to-latest.patch | 95 ++++++++++++++++++++++ guestfs-tools/guestfs-tools.spec | 8 +- 8 files changed, 108 insertions(+), 7 deletions(-) create mode 100644 guestfs-tools/0007-Update-common-submodule-to-latest.patch diff --git a/guestfs-tools/0001-po-docs-podfiles-Fix-bogus-directories-in-this-file.patch b/guestfs-tools/0001-po-docs-podfiles-Fix-bogus-directories-in-this-file.patch index bb550b1..831030c 100644 --- a/guestfs-tools/0001-po-docs-podfiles-Fix-bogus-directories-in-this-file.patch +++ b/guestfs-tools/0001-po-docs-podfiles-Fix-bogus-directories-in-this-file.patch @@ -1,7 +1,7 @@ From 3bcb261f69dab9121a30aa452ef5bb6001c2f58e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 23 Mar 2021 14:09:44 +0000 -Subject: [PATCH 1/6] po-docs/podfiles: Fix bogus directories in this file. +Subject: [PATCH 1/7] po-docs/podfiles: Fix bogus directories in this file. These were caused by a partial dist directory having been created, and then "make podfiles" being run at the wrong moment. diff --git a/guestfs-tools/0002-po-docs-Don-t-try-to-install-.3-and-.5-files-which-d.patch b/guestfs-tools/0002-po-docs-Don-t-try-to-install-.3-and-.5-files-which-d.patch index eb3da00..bb002aa 100644 --- a/guestfs-tools/0002-po-docs-Don-t-try-to-install-.3-and-.5-files-which-d.patch +++ b/guestfs-tools/0002-po-docs-Don-t-try-to-install-.3-and-.5-files-which-d.patch @@ -1,7 +1,7 @@ From cba4cc0f5148fae6a8ba34c03559b9328749cbf1 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 23 Mar 2021 12:19:01 +0000 -Subject: [PATCH 2/6] po-docs: Don't try to install *.3 and *.5 files which +Subject: [PATCH 2/7] po-docs: Don't try to install *.3 and *.5 files which don't exist. Fixes: commit 4354a3126152a2748cc9097cba139b3908ccc342 diff --git a/guestfs-tools/0003-build-Remove-dependency-on-gobject-introspection.patch b/guestfs-tools/0003-build-Remove-dependency-on-gobject-introspection.patch index 6aec678..db3e9c7 100644 --- a/guestfs-tools/0003-build-Remove-dependency-on-gobject-introspection.patch +++ b/guestfs-tools/0003-build-Remove-dependency-on-gobject-introspection.patch @@ -1,7 +1,7 @@ From 6bfe41474937bbaabd7c953ac62dc9a28aa6fa30 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 23 Mar 2021 13:38:56 +0000 -Subject: [PATCH 3/6] build: Remove dependency on gobject-introspection. +Subject: [PATCH 3/7] build: Remove dependency on gobject-introspection. Only required for libguestfs GObject bindings, not for these tools. diff --git a/guestfs-tools/0004-build-Remove-dependency-on-perl-Sys-Virt.patch b/guestfs-tools/0004-build-Remove-dependency-on-perl-Sys-Virt.patch index 86a6b20..e11a19e 100644 --- a/guestfs-tools/0004-build-Remove-dependency-on-perl-Sys-Virt.patch +++ b/guestfs-tools/0004-build-Remove-dependency-on-perl-Sys-Virt.patch @@ -1,7 +1,7 @@ From 47efe06984ae1e0ba914ebcf9306d348a5ecd366 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 23 Mar 2021 13:52:19 +0000 -Subject: [PATCH 4/6] build: Remove dependency on perl Sys::Virt. +Subject: [PATCH 4/7] build: Remove dependency on perl Sys::Virt. In libguestfs this used to be required to run tests against local guests, but it's not needed in either libguestfs or guestfs-tools any diff --git a/guestfs-tools/0005-builder-Get-rid-of-etc-xdg-and-XDG_CONFIG_DIRS-nonse.patch b/guestfs-tools/0005-builder-Get-rid-of-etc-xdg-and-XDG_CONFIG_DIRS-nonse.patch index 333c7d6..2b7563f 100644 --- a/guestfs-tools/0005-builder-Get-rid-of-etc-xdg-and-XDG_CONFIG_DIRS-nonse.patch +++ b/guestfs-tools/0005-builder-Get-rid-of-etc-xdg-and-XDG_CONFIG_DIRS-nonse.patch @@ -1,7 +1,7 @@ From f66af6b6ddfefcbd6ecd6f4d47e0fa4ca231b125 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 23 Mar 2021 14:06:12 +0000 -Subject: [PATCH 5/6] builder: Get rid of /etc/xdg and XDG_CONFIG_DIRS +Subject: [PATCH 5/7] builder: Get rid of /etc/xdg and XDG_CONFIG_DIRS nonsense. Put the configuration in /etc/virt-builder as god intended. diff --git a/guestfs-tools/0006-builder-Use-correct-ounit2-module.patch b/guestfs-tools/0006-builder-Use-correct-ounit2-module.patch index b5d1846..6d0ed19 100644 --- a/guestfs-tools/0006-builder-Use-correct-ounit2-module.patch +++ b/guestfs-tools/0006-builder-Use-correct-ounit2-module.patch @@ -1,7 +1,7 @@ From b470270d44e8dc37a2417c1157eefdd9c3d65dd1 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 24 Mar 2021 18:30:45 +0000 -Subject: [PATCH 6/6] builder: Use correct ounit2 module. +Subject: [PATCH 6/7] builder: Use correct ounit2 module. Fixes: commit 4354a3126152a2748cc9097cba139b3908ccc342 --- diff --git a/guestfs-tools/0007-Update-common-submodule-to-latest.patch b/guestfs-tools/0007-Update-common-submodule-to-latest.patch new file mode 100644 index 0000000..19f7cd2 --- /dev/null +++ b/guestfs-tools/0007-Update-common-submodule-to-latest.patch @@ -0,0 +1,95 @@ +From 6e80a33b70f89c18cd2fbde739243e8c5a7efc25 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Thu, 25 Mar 2021 08:14:49 +0000 +Subject: [PATCH 7/7] Update common submodule to latest. + +--- + common | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Submodule common ca8a16a926..7c39a06fe3: +diff --git a/common/mlstdutils/Makefile.am b/common/mlstdutils/Makefile.am +index 2b4aed8..650f18c 100644 +--- a/common/mlstdutils/Makefile.am ++++ b/common/mlstdutils/Makefile.am +@@ -85,7 +85,7 @@ OCAMLPACKAGES = \ + -I $(builddir) + OCAMLPACKAGES_TESTS = $(MLSTDUTILS_CMA) + if HAVE_OCAML_PKG_OUNIT +-OCAMLPACKAGES_TESTS += -package oUnit ++OCAMLPACKAGES_TESTS += -package ounit2 + endif + + OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) -ccopt '$(CFLAGS)' +diff --git a/common/mltools/Makefile.am b/common/mltools/Makefile.am +index 6bb2b88..5cec178 100644 +--- a/common/mltools/Makefile.am ++++ b/common/mltools/Makefile.am +@@ -129,7 +129,7 @@ if HAVE_OCAML_PKG_GETTEXT + OCAMLPACKAGES += -package gettext-stub + endif + if HAVE_OCAML_PKG_OUNIT +-OCAMLPACKAGES_TESTS += -package oUnit ++OCAMLPACKAGES_TESTS += -package ounit2 + endif + + OCAMLCLIBS = \ +@@ -263,7 +263,8 @@ tools_utils_tests_DEPENDENCIES = \ + $(MLTOOLS_CMA) \ + $(top_srcdir)/ocaml-link.sh + tools_utils_tests_LINK = \ +- $(top_srcdir)/ocaml-link.sh -cclib '-lutils $(LIBXML2_LIBS) -lgnu' -- \ ++ $(top_srcdir)/ocaml-link.sh \ ++ -cclib '-pthread -lpthread -lutils $(LIBXML2_LIBS) -lgnu' -- \ + $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLLINKFLAGS) \ + $(OCAMLPACKAGES) $(OCAMLPACKAGES_TESTS) \ + $(tools_utils_tests_THEOBJECTS) -o $@ +@@ -290,7 +291,8 @@ JSON_tests_DEPENDENCIES = \ + $(MLTOOLS_CMA) \ + $(top_srcdir)/ocaml-link.sh + JSON_tests_LINK = \ +- $(top_srcdir)/ocaml-link.sh -- \ ++ $(top_srcdir)/ocaml-link.sh \ ++ -cclib '-pthread -lpthread' -- \ + $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLLINKFLAGS) \ + $(OCAMLPACKAGES) $(OCAMLPACKAGES_TESTS) \ + $(JSON_tests_THEOBJECTS) -o $@ +@@ -303,7 +305,8 @@ JSON_parser_tests_DEPENDENCIES = \ + $(MLTOOLS_CMA) \ + $(top_srcdir)/ocaml-link.sh + JSON_parser_tests_LINK = \ +- $(top_srcdir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \ ++ $(top_srcdir)/ocaml-link.sh \ ++ -cclib '-pthread -lpthread $(OCAMLCLIBS)' -- \ + $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLLINKFLAGS) \ + $(OCAMLPACKAGES) $(OCAMLPACKAGES_TESTS) \ + $(JSON_parser_tests_THEOBJECTS) -o $@ +diff --git a/common/mlutils/Makefile.am b/common/mlutils/Makefile.am +index e86d7bb..17dfac3 100644 +--- a/common/mlutils/Makefile.am ++++ b/common/mlutils/Makefile.am +@@ -112,10 +112,10 @@ c_utils_unit_tests_CFLAGS = $(libmlcutils_a_CFLAGS) + if !HAVE_OCAMLOPT + # Can't call this c_utils_unit_tests_OBJECTS because automake gets confused. + c_utils_unit_tests_THEOBJECTS = $(c_utils_unit_tests_BOBJECTS) +-c_utils_unit_tests.cmo: OCAMLPACKAGES += -package oUnit ++c_utils_unit_tests.cmo: OCAMLPACKAGES += -package ounit2 + else + c_utils_unit_tests_THEOBJECTS = $(c_utils_unit_tests_XOBJECTS) +-c_utils_unit_tests.cmx: OCAMLPACKAGES += -package oUnit ++c_utils_unit_tests.cmx: OCAMLPACKAGES += -package ounit2 + endif + + OCAMLLINKFLAGS = \ +@@ -131,7 +131,7 @@ c_utils_unit_tests_DEPENDENCIES = \ + c_utils_unit_tests_LINK = \ + $(top_srcdir)/ocaml-link.sh -cclib '-lutils -lgnu' -- \ + $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) \ +- $(OCAMLPACKAGES) -package oUnit \ ++ $(OCAMLPACKAGES) -package ounit2 \ + $(OCAMLLINKFLAGS) \ + $(c_utils_unit_tests_THEOBJECTS) -o $@ + +-- +2.29.0.rc2 + diff --git a/guestfs-tools/guestfs-tools.spec b/guestfs-tools/guestfs-tools.spec index de3f466..c356506 100644 --- a/guestfs-tools/guestfs-tools.spec +++ b/guestfs-tools/guestfs-tools.spec @@ -26,7 +26,7 @@ Summary: Tools to access and modify virtual machine disk images Name: guestfs-tools Version: 1.45.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ # Build only for architectures that have a kernel @@ -52,6 +52,7 @@ Patch3: 0003-build-Remove-dependency-on-gobject-introspection.patch Patch4: 0004-build-Remove-dependency-on-perl-Sys-Virt.patch Patch5: 0005-builder-Get-rid-of-etc-xdg-and-XDG_CONFIG_DIRS-nonse.patch Patch6: 0006-builder-Use-correct-ounit2-module.patch +Patch7: 0007-Update-common-submodule-to-latest.patch %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool, gettext-devel @@ -64,6 +65,7 @@ BuildRequires: libguestfs-devel >= 1.44.0 BuildRequires: libguestfs-xfs BuildRequires: perl(Pod::Simple) BuildRequires: perl(Pod::Man) +BuildRequires: perl(Test::More) BuildRequires: /usr/bin/pod2text BuildRequires: po4a BuildRequires: pcre2-devel @@ -390,6 +392,10 @@ gzip --best installed-docs/*.xml %changelog +* Thu Mar 25 2021 Richard W.M. Jones - 1.45.2-3 +- Add perl(Test::More) dependency for the Perl test suite. +- Fix ounit2 dependency again. + * Wed Mar 24 2021 Richard W.M. Jones - 1.45.2-2 - Add perl(Locale::TextDomain) dependency for virt-win-reg. - Fix ounit2 dependency upstream. -- 1.8.3.1