rpms/guestfs-tools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove patch which is included upstream

Browse Source
This commit is contained in:
Richard W.M. Jones 2023-01-17 12:34:43 +00:00
parent 72d42a2227
commit 30688fb62e
2 changed files with 2 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
0001-inspector-Update-coreos-test-for-new-build_id-field.patch
View File

@ -1,37 +0,0 @@
From bb9cb86106f96d11c81216d4c59efe8759eba904 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 10 Dec 2022 14:35:41 +0000
Subject: [PATCH] inspector: Update coreos test for new <build_id> field
When running against libguestfs >= 1.49.8 which provides the new
guestfs_inspect_get_build_id API the test would fail with:
<major_version>899</major_version>
<minor_version>13</minor_version>
<hostname>coreos.invalid</hostname>
+ <build_id>2016-03-23-0120</build_id>
<osinfo>coreos899.13</osinfo>
<mountpoints>
<mountpoint dev="/dev/sda5">/</mountpoint>
FAIL test-virt-inspector.sh (exit status: 1)
Fixes: commit 4e703943ca0ac4dc5ae5a1aec229c58c56e83158
---
inspector/expected-coreos.img.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/inspector/expected-coreos.img.xml b/inspector/expected-coreos.img.xml
index 0cdfba6e65..2461bcfb45 100644
--- a/inspector/expected-coreos.img.xml
+++ b/inspector/expected-coreos.img.xml
@@ -8,6 +8,7 @@
<major_version>899</major_version>
<minor_version>13</minor_version>
<hostname>coreos.invalid</hostname>
+ <build_id>2016-03-23-0120</build_id>
<osinfo>coreos899.13</osinfo>
<mountpoints>
<mountpoint dev="/dev/sda5">/</mountpoint>
--
2.37.3

7
guestfs-tools.spec
View File

@ -26,7 +26,7 @@
Summary: Tools to access and modify virtual machine disk images
Name: guestfs-tools
Version: 1.49.8
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2+
# Build only for architectures that have a kernel
@ -48,9 +48,6 @@ Source1: http://download.libguestfs.org/guestfs-tools/%{source_directory}/
Source2: libguestfs.keyring
%endif
# Upstream patch to fix virt-inspector test.
Patch: 0001-inspector-Update-coreos-test-for-new-build_id-field.patch
%if 0%{patches_touch_autotools}
BuildRequires: autoconf, automake, libtool, gettext-devel
%endif
@ -429,7 +426,7 @@ end
%changelog
* Tue Jan 17 2023 Richard W.M. Jones <rjones@redhat.com> - 1.49.8-1
* Tue Jan 17 2023 Richard W.M. Jones <rjones@redhat.com> - 1.49.8-2
- New upstream development version 1.49.8
* Sat Dec 10 2022 Richard W.M. Jones <rjones@redhat.com> - 1.49.7-2