rpms/libguestfs
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add upstream patch which helps debugging appliance generation.

Browse Source
This commit is contained in:
Richard W.M. Jones 2022-05-21 11:13:29 +01:00
parent 3336b47a09
commit 4c4ca3eda2
2 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
0001-appliance-Print-guestfsd.deps-after-generation.patch Normal file
View File

@ -0,0 +1,27 @@
From b5260d8cd62f93b1cc4faf285bc3b6d8e0168e3b Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 21 May 2022 11:10:29 +0100
Subject: [PATCH] appliance: Print guestfsd.deps after generation
Sometimes generating this file fails. To help with debugging these
situatons, print the guestfsd.deps file after it has been generated.
---
appliance/Makefile.am | 2 ++
1 file changed, 2 insertions(+)
diff --git a/appliance/Makefile.am b/appliance/Makefile.am
index 6dd1df75a6..9a0ba98a06 100644
--- a/appliance/Makefile.am
+++ b/appliance/Makefile.am
@@ -101,6 +101,8 @@ guestfsd.deps: ../daemon/guestfsd
sort -u > $@.t
rm -f ld.so.cache.txt
mv $@.t $@
+ @echo "guestfsd.deps:"
+ @cat $@
packagelist: packagelist.in Makefile guestfsd.deps
m4 $(PACKAGELIST_CPP_FLAGS) $< | \
--
2.35.1

10
libguestfs.spec
View File

@ -29,7 +29,7 @@
# If there are patches which touch autotools files, set this to 1.
%if !0%{?rhel}
%global patches_touch_autotools %{nil}
%global patches_touch_autotools 1
%else
# On RHEL the downstream patches always touch autotools files.
%global patches_touch_autotools 1
@ -48,7 +48,7 @@ Summary: Access and modify virtual machine disk images
Name: libguestfs
Epoch: 1
Version: 1.49.1
Release: 1%{?dist}
Release: 2%{?dist}
License: LGPLv2+
# Build only for architectures that have a kernel
@ -82,6 +82,9 @@ Source7: libguestfs.keyring
# Maintainer script which helps with handling patches.
Source8: copy-patches.sh
# Upstream patch which helps debugging appliance generation.
Patch1: 0001-appliance-Print-guestfsd.deps-after-generation.patch
%if 0%{patches_touch_autotools}
BuildRequires: autoconf, automake, libtool, gettext-devel
%endif
@ -1124,6 +1127,9 @@ rm ocaml/html/.gitignore
%changelog
* Sat May 21 2022 Richard W.M. Jones <rjones@redhat.com> - 1:1.49.1-2
- Add upstream patch which helps debugging appliance generation.
* Thu May 12 2022 Richard W.M. Jones <rjones@redhat.com> - 1:1.49.1-1
- New upstream development version 1.49.1