Compare commits

...
Sign in to create a new pull request.

10 commits

Author SHA1 Message Date
Richard W.M. Jones
dd9aadb4c8 Bump release
- Fix bytecode compilation (RHBZ#2274708)
2024-04-12 22:26:04 +01:00
Richard W.M. Jones
936b29da1b Fix bytecode compilation (RHBZ#2274708)
(cherry picked from commit 5d4370f788)
2024-04-12 22:25:34 +01:00
Richard W.M. Jones
38386ebb46 Unconditionally run autoreconf
(cherry picked from commit aae2f9ce73)
2024-04-12 22:25:26 +01:00
Richard W.M. Jones
98ae78f391 Add new virt-v2v-release-notes-2.4(1) man page to %files
(cherry picked from commit f979570668)
2024-01-04 18:25:24 +00:00
Richard W.M. Jones
0f35762d80 New stable branch version 2.4.0
(cherry picked from commit 557617d39a)
2024-01-04 18:25:22 +00:00
Richard W.M. Jones
737598ffde New development branch version 2.3.8
(cherry picked from commit 354d961584)
2023-12-19 15:52:49 +00:00
Richard W.M. Jones
a636044383 Fixes a crash in virt-v2v and virt-customize
(cherry picked from commit 04f4df6031)
2023-12-09 13:47:57 +00:00
Richard W.M. Jones
9a0233d7be New development branch version 2.3.7
(cherry picked from commit 3777fa33c6)
2023-12-09 12:08:35 +00:00
Richard W.M. Jones
ba51d56981 Fix build for libxml2 2.12.1
(cherry picked from commit 1b882146a3)
2023-12-09 12:08:31 +00:00
Richard W.M. Jones
06731df131 New development branch version 2.3.6 2023-11-02 11:27:57 +00:00
3 changed files with 58 additions and 18 deletions

View file

@ -0,0 +1,31 @@
From 5eeae696b2c56230d5d5fed5c86b7bf2b3942d4e Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Fri, 12 Apr 2024 20:11:50 +0100
Subject: [PATCH] Fix bytecode compilation to output whole exe instead of using
-custom
These binaries are more resistant to being stripped.
Reported-by: Ilya Leoshkevich
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2274708
(cherry picked from guestfs-tools commit c249fd5caca8f1eed439f83e2bb1af46c8a28a27)
---
subdir-rules.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/subdir-rules.mk b/subdir-rules.mk
index 78d574a813..e969f357b7 100644
--- a/subdir-rules.mk
+++ b/subdir-rules.mk
@@ -47,7 +47,7 @@ $(top_builddir)/generator/generator:
if !HAVE_OCAMLOPT
MLARCHIVE = cma
-LINK_CUSTOM_OCAMLC_ONLY = -custom
+LINK_CUSTOM_OCAMLC_ONLY = -output-complete-exe
BEST = c
else
MLARCHIVE = cmxa
--
2.44.0

View file

@ -1,2 +1,2 @@
SHA512 (virt-v2v-2.3.5.tar.gz) = 30829a8e88a773476198f96c7355bcbc715fa95ca2b3be5427de6e1ff1db05e7e22312e7e7d60b4b0e7c556ddd54f517206332b65f8b8649cbb05ec96304373e
SHA512 (virt-v2v-2.3.5.tar.gz.sig) = bab80165cebc9e71387769949123f577d5a587bce8e3a7bf9973a0a9b9bee0b2b4a32a98d73d9de97774edd68098debf6d0a60aec4c529c0b3efdd239eb555d6
SHA512 (virt-v2v-2.4.0.tar.gz) = c59c613bcc2474c1efec6a68401d3c1dd4dd6f0e8bfdbc0f77ff2fff2191982c35d14944ca1727aee31e111361ab498e0c0e0d840099a340d05603a36f6e6639
SHA512 (virt-v2v-2.4.0.tar.gz.sig) = 4b1bd638f0e5489ed4fe076d0b2d2c7e7a7514bca8a4d44f201253147adfbb2d97a4b9b35f884520c6dfbb94f84733d7a61981fbba5e2ecc636eb5d64635658c

View file

@ -1,20 +1,12 @@
# If we should 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 %{nil}
%endif
# The source directory.
%global source_directory 2.3-development
%global source_directory 2.4-stable
Name: virt-v2v
Epoch: 1
Version: 2.3.5
Version: 2.4.0
Release: 2%{?dist}
Summary: Convert a virtual machine to run on KVM
@ -31,6 +23,9 @@ Source2: libguestfs.keyring
# Maintainer script which helps with handling patches.
Source3: copy-patches.sh
# Fix bytecode compilation (RHBZ#2274708)
Patch: 0001-Fix-bytecode-compilation-to-output-whole-exe-instead.patch
%if !0%{?rhel}
# libguestfs hasn't been built on i686 for a while since there is no
# kernel built for this architecture any longer and libguestfs rather
@ -48,10 +43,7 @@ ExcludeArch: %{ix86}
ExclusiveArch: x86_64
%endif
%if 0%{patches_touch_autotools}
BuildRequires: autoconf, automake, libtool
%endif
BuildRequires: make
BuildRequires: /usr/bin/pod2man
BuildRequires: gcc
@ -210,9 +202,7 @@ for %{name}.
%endif
%autosetup -p1
%if 0%{patches_touch_autotools}
autoreconf -i
%endif
autoreconf -fiv
%build
@ -298,6 +288,7 @@ done
%{_mandir}/man1/virt-v2v-release-notes-1.42.1*
%{_mandir}/man1/virt-v2v-release-notes-2.0.1*
%{_mandir}/man1/virt-v2v-release-notes-2.2.1*
%{_mandir}/man1/virt-v2v-release-notes-2.4.1*
%{_mandir}/man1/virt-v2v-support.1*
%{_datadir}/virt-tools
@ -318,6 +309,24 @@ done
%changelog
* Fri Apr 12 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.4.0-2
- Fix bytecode compilation (RHBZ#2274708)
* Thu Jan 4 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.4.0-1
- New stable branch version 2.4.0
* Tue Dec 19 2023 Richard W.M. Jones <rjones@redhat.com> - 1:2.3.8-1
- New development branch version 2.3.8
* Sat Dec 09 2023 Richard W.M. Jones <rjones@redhat.com> - 1:2.3.7-2
- New development branch version 2.3.7
* Mon Nov 27 2023 Richard W.M. Jones <rjones@redhat.com> - 1:2.3.6-2
- Fix build for libxml2 2.12.1
* Thu Nov 02 2023 Richard W.M. Jones <rjones@redhat.com> - 1:2.3.6-1
- New development branch version 2.3.6
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.3.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild