From c5a9c60484c5d4ba316416b7ddf16a88b6363569436164be00a27409a39e11f5 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 13 Apr 2021 15:13:14 +0000 Subject: [PATCH 1/5] - Require current ocaml-rpm-macros OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=466 --- libguestfs.changes | 5 +++++ libguestfs.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libguestfs.changes b/libguestfs.changes index fbd735f..3f36659 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Apr 9 09:09:09 UTC 2021 - ohering@suse.de + +- Require current ocaml-rpm-macros + ------------------------------------------------------------------- Tue Jan 12 05:38:44 MST 2021 - carnold@suse.com diff --git a/libguestfs.spec b/libguestfs.spec index 887e6d9..501e8f8 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -118,7 +118,7 @@ BuildRequires: ocaml-hivex-devel BuildRequires: ocaml-libvirt-devel # -BuildRequires: ocaml-rpm-macros >= 4.03 +BuildRequires: ocaml-rpm-macros >= 20210409 %if %{with ocaml_bindings} %define _configure_ocaml --enable-ocaml %endif @@ -738,7 +738,7 @@ rm %{buildroot}/%{_datadir}/virt-p2v/p2v.ks.in %dir %{_libdir}/ocaml %dir %{_libdir}/ocaml/guestfs %{_libdir}/ocaml/guestfs/*.a -%if %{ocaml_native_compiler} +%if %{suse_ocaml_native_compiler} %{_libdir}/ocaml/guestfs/*.cmx %{_libdir}/ocaml/guestfs/*.cmxa %endif From f61506fba138df380810c091ac9921f0f92f810e154622bd28636c2e19d46abc Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 13 Apr 2021 15:18:55 +0000 Subject: [PATCH 2/5] style OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=467 --- libguestfs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libguestfs.spec b/libguestfs.spec index 501e8f8..95b6548 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -738,7 +738,7 @@ rm %{buildroot}/%{_datadir}/virt-p2v/p2v.ks.in %dir %{_libdir}/ocaml %dir %{_libdir}/ocaml/guestfs %{_libdir}/ocaml/guestfs/*.a -%if %{suse_ocaml_native_compiler} +%if 0%{?suse_ocaml_native_compiler} %{_libdir}/ocaml/guestfs/*.cmx %{_libdir}/ocaml/guestfs/*.cmxa %endif From 681c070c87912e0d5897fc91b3f68d3be88059a0707c8105c2dc17efb2be921e Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 14 Apr 2021 08:09:18 +0000 Subject: [PATCH 3/5] - Update to version 1.44.1 * lib/appliance-kcmdline.c: Read UUID directly from appliance. * daemon/xfs.c: Fix error message. * daemon: chroot: Fix long-standing possible deadlock. * daemon: Don't return bogus failure from readdir. * daemon/btrfs.c: Ignore mkfs.btrfs allocstart option. * python: Ignore code style error E128. * php: Fix the build. * builder: Don't redefine Val_none (OCaml 4.12). * daemon: lvm: Use lvcreate --yes to avoid interactive prompts. * Update common submodule. * lib/fuse.c: Use safe_malloc instead of malloc. * fuse/guestmount.c: Avoid leaking fp on error path. * diff: Don't try to call unlink(NULL) on certain error paths. * daemon/tar.c: Avoid bogus GCC analyzer warning. * daemon/command.c daemon/debug.c df/main.c: Ignore bogus GCC analyzer warnings * appliance: Add dhclient for Arch-like Manjaro distro. * fish/tilde.c: Suppress more bogus -fanalyser warnings. * lib/qemu.c: Suppress another bogus -fanalyser warning. * builder: templates: Add ubuntu-20.04. * builder: templates: Added rhel-7.9. * lib: Move CLEANUP_GL_RECURSIVE_LOCK_UNLOCK to libguestfs header. * appliance: Avoid having ${exec_prefix} in guestfs appliance path. * build: Avoid warnings about unknown pragmas. OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=468 --- libguestfs-1.44.0.tar.gz | 3 --- libguestfs-1.44.1.tar.gz | 3 +++ libguestfs.changes | 28 ++++++++++++++++++++++++++++ libguestfs.spec | 2 +- 4 files changed, 32 insertions(+), 4 deletions(-) delete mode 100644 libguestfs-1.44.0.tar.gz create mode 100644 libguestfs-1.44.1.tar.gz diff --git a/libguestfs-1.44.0.tar.gz b/libguestfs-1.44.0.tar.gz deleted file mode 100644 index 0bd5ad2..0000000 --- a/libguestfs-1.44.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0ec7b44a4c50e928583c56099da31ceb9680766043bd7d468f3ca7b741c55d21 -size 23469286 diff --git a/libguestfs-1.44.1.tar.gz b/libguestfs-1.44.1.tar.gz new file mode 100644 index 0000000..ceeb860 --- /dev/null +++ b/libguestfs-1.44.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72b7dcdd32da1c17c932cf5a0a70b3bd68bc93e94828ad66a539f2e616adb025 +size 23798268 diff --git a/libguestfs.changes b/libguestfs.changes index 3f36659..df429d6 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Tue Apr 13 13:13:13 UTC 2021 - ohering@suse.de + +- Update to version 1.44.1 + * lib/appliance-kcmdline.c: Read UUID directly from appliance. + * daemon/xfs.c: Fix error message. + * daemon: chroot: Fix long-standing possible deadlock. + * daemon: Don't return bogus failure from readdir. + * daemon/btrfs.c: Ignore mkfs.btrfs allocstart option. + * python: Ignore code style error E128. + * php: Fix the build. + * builder: Don't redefine Val_none (OCaml 4.12). + * daemon: lvm: Use lvcreate --yes to avoid interactive prompts. + * Update common submodule. + * lib/fuse.c: Use safe_malloc instead of malloc. + * fuse/guestmount.c: Avoid leaking fp on error path. + * diff: Don't try to call unlink(NULL) on certain error paths. + * daemon/tar.c: Avoid bogus GCC analyzer warning. + * daemon/command.c daemon/debug.c df/main.c: Ignore bogus GCC analyzer warnings + * appliance: Add dhclient for Arch-like Manjaro distro. + * fish/tilde.c: Suppress more bogus -fanalyser warnings. + * lib/qemu.c: Suppress another bogus -fanalyser warning. + * builder: templates: Add ubuntu-20.04. + * builder: templates: Added rhel-7.9. + * lib: Move CLEANUP_GL_RECURSIVE_LOCK_UNLOCK to libguestfs header. + * appliance: Avoid having ${exec_prefix} in guestfs appliance path. + * build: Avoid warnings about unknown pragmas. + ------------------------------------------------------------------- Fri Apr 9 09:09:09 UTC 2021 - ohering@suse.de diff --git a/libguestfs.spec b/libguestfs.spec index 95b6548..7db4fe7 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -18,7 +18,7 @@ # needsbinariesforbuild -Version: 1.44.0 +Version: 1.44.1 Release: 0 %{ocaml_preserve_bytecode} From fdd94d0c9c630e24473542e700f15aac91c2ca02056d69613f945baec25e28ff Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 14 Apr 2021 08:36:39 +0000 Subject: [PATCH 4/5] - add libguestfs.env.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=469 --- libguestfs.changes | 1 + libguestfs.env.patch | 32 ++++++++++++++++++++++++++++++++ libguestfs.spec | 2 ++ 3 files changed, 35 insertions(+) create mode 100644 libguestfs.env.patch diff --git a/libguestfs.changes b/libguestfs.changes index df429d6..752077e 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -25,6 +25,7 @@ Tue Apr 13 13:13:13 UTC 2021 - ohering@suse.de * lib: Move CLEANUP_GL_RECURSIVE_LOCK_UNLOCK to libguestfs header. * appliance: Avoid having ${exec_prefix} in guestfs appliance path. * build: Avoid warnings about unknown pragmas. +- add libguestfs.env.patch ------------------------------------------------------------------- Fri Apr 9 09:09:09 UTC 2021 - ohering@suse.de diff --git a/libguestfs.env.patch b/libguestfs.env.patch new file mode 100644 index 0000000..23a8bac --- /dev/null +++ b/libguestfs.env.patch @@ -0,0 +1,32 @@ +--- a/tools/virt-list-filesystems ++++ b/tools/virt-list-filesystems +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/bin/perl + # virt-list-filesystems + # Copyright (C) 2009-2020 Red Hat Inc. + # +--- a/tools/virt-list-partitions ++++ b/tools/virt-list-partitions +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/bin/perl + # virt-list-partitions + # Copyright (C) 2010 Red Hat Inc. + # +--- a/tools/virt-tar ++++ b/tools/virt-tar +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/bin/perl + # virt-tar + # Copyright (C) 2009-2020 Red Hat Inc. + # +--- a/tools/virt-win-reg ++++ b/tools/virt-win-reg +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/bin/perl + # virt-win-reg + # Copyright (C) 2010 Red Hat Inc. + # diff --git a/libguestfs.spec b/libguestfs.spec index 7db4fe7..089bb5a 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -153,6 +153,7 @@ Patch53: 0004-python-include-dirs.patch # Our patches Patch100: appliance.patch Patch101: netconfig.patch +Patch102: libguestfs.env.patch Source0: https://download.libguestfs.org/1.44-stable/libguestfs-%{version}.tar.gz Source3: libguestfs.rpmlintrc @@ -544,6 +545,7 @@ It can import a variety of guest operating systems from libvirt-managed hosts. %patch53 -p1 %patch100 -p1 %patch101 -p1 +%patch102 -p1 %build %global _lto_cflags %{_lto_cflags} -ffat-lto-objects From 80874171afd0e21f6f5b0bdccaa3818d3a38b9ab6615e54b32c538616af37f96 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 21 Apr 2021 13:09:58 +0000 Subject: [PATCH 5/5] - Remove ocaml_native_compiler conditional build native target unconditionally OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=470 --- libguestfs.changes | 7 ++----- libguestfs.spec | 4 +--- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/libguestfs.changes b/libguestfs.changes index 752077e..8eeed3f 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -26,11 +26,8 @@ Tue Apr 13 13:13:13 UTC 2021 - ohering@suse.de * appliance: Avoid having ${exec_prefix} in guestfs appliance path. * build: Avoid warnings about unknown pragmas. - add libguestfs.env.patch - -------------------------------------------------------------------- -Fri Apr 9 09:09:09 UTC 2021 - ohering@suse.de - -- Require current ocaml-rpm-macros +- Remove ocaml_native_compiler conditional + build native target unconditionally ------------------------------------------------------------------- Tue Jan 12 05:38:44 MST 2021 - carnold@suse.com diff --git a/libguestfs.spec b/libguestfs.spec index 089bb5a..f055868 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -118,7 +118,7 @@ BuildRequires: ocaml-hivex-devel BuildRequires: ocaml-libvirt-devel # -BuildRequires: ocaml-rpm-macros >= 20210409 +BuildRequires: ocaml-rpm-macros %if %{with ocaml_bindings} %define _configure_ocaml --enable-ocaml %endif @@ -740,10 +740,8 @@ rm %{buildroot}/%{_datadir}/virt-p2v/p2v.ks.in %dir %{_libdir}/ocaml %dir %{_libdir}/ocaml/guestfs %{_libdir}/ocaml/guestfs/*.a -%if 0%{?suse_ocaml_native_compiler} %{_libdir}/ocaml/guestfs/*.cmx %{_libdir}/ocaml/guestfs/*.cmxa -%endif %{_libdir}/ocaml/guestfs/*.mli %endif #