From 8327a03b19dc6aa251e377c2f6d5f7a8a1957feaeb7e437d52b68bc62d025b6e Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Thu, 15 Dec 2022 17:48:56 +0000 Subject: [PATCH 1/2] Accepting request 1039189 from openSUSE:Factory:RISCV - Enable build on riscv64 OBS-URL: https://build.opensuse.org/request/show/1039189 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=532 --- libguestfs.changes | 5 +++++ libguestfs.spec | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libguestfs.changes b/libguestfs.changes index b07143c..1d0f922 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 30 14:34:58 UTC 2022 - Andreas Schwab + +- Enable build on riscv64 + ------------------------------------------------------------------- Tue Nov 29 11:45:36 MST 2022 - carnold@suse.com diff --git a/libguestfs.spec b/libguestfs.spec index 4c7411b..c1481ca 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -17,7 +17,7 @@ Name: libguestfs -ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64 +ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64 riscv64 Version: 1.48.6 Release: 0 Summary: Access and modify virtual machine disk images @@ -104,6 +104,9 @@ sed -i 's|RPMVSF_MASK_NOSIGNATURES|_RPMVSF_NOSIGNATURES|' daemon/rpm-c.c %ifarch ppc64 %define kvm_binary %{_bindir}/qemu-system-ppc64 %endif +%ifarch riscv64 +%define kvm_binary %{_bindir}/qemu-system-riscv64 +%endif %ifarch s390x %define kvm_binary %{_bindir}/qemu-system-s390x %endif From 371394c089bc07da545cdab6bc7f41f2201b30f0bc72fc126201938724b4720d Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Fri, 16 Dec 2022 16:34:17 +0000 Subject: [PATCH 2/2] Accepting request 1043309 from home:dimstar:Factory - Fix build with RPM 4.18: rpm wants to do a proper cleanup, and fails on the design choice to have /usr/lib65 without write permission. As we already tar'ed the content up, we can simply change the permissions of winsupport's content to allow proper erasing. OBS-URL: https://build.opensuse.org/request/show/1043309 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=533 --- libguestfs.changes | 9 +++++++++ libguestfs.spec | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/libguestfs.changes b/libguestfs.changes index 1d0f922..52ee25f 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Dec 16 09:08:08 UTC 2022 - Dominique Leuenberger + +- Fix build with RPM 4.18: rpm wants to do a proper cleanup, and + fails on the design choice to have /usr/lib65 without write + permission. As we already tar'ed the content up, we can simply + change the permissions of winsupport's content to allow proper + erasing. + ------------------------------------------------------------------- Wed Nov 30 14:34:58 UTC 2022 - Andreas Schwab diff --git a/libguestfs.spec b/libguestfs.spec index c1481ca..a59eaa4 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -259,6 +259,10 @@ libfuse2 hwinfo EOF +# do some cleanup so that rpm can properly empty directories without permission denie +# The winsupport directory has already been tar'ed up, so we don't care much +find winsupport -type d -exec chmod 755 {} \; + mkdir -p %{buildroot}/tmp/usr/bin cp %{S:100} %{buildroot}/tmp/usr/bin chmod a+x %{buildroot}/tmp/usr/bin/*