From a72423248eb2cc34bbc39dd780ee41cdc35aba42 Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Tue, 19 Jul 2022 07:44:54 +0200 Subject: [PATCH] Do not package qemu-riscv32-static.conf on riscv64 This files does not exist on riscv64 architecture: [..] Processing files: qemu-user-static-riscv-7.0.0-6.1.riscv64.fc33.riscv64 error: File not found: /builddir/build/BUILDROOT/qemu-7.0.0-6.1.riscv64.fc33.riscv64/usr/lib/binfmt.d/qemu-riscv32-static.conf RPM build errors: File not found: /builddir/build/BUILDROOT/qemu-7.0.0-6.1.riscv64.fc33.riscv64/usr/lib/binfmt.d/qemu-riscv32-static.conf Child return code was: 1 EXCEPTION: [Error()] Signed-off-by: David Abdurachmanov --- qemu.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/qemu.spec b/qemu.spec index 5cc9b36..22e2ac5 100644 --- a/qemu.spec +++ b/qemu.spec @@ -326,7 +326,7 @@ Obsoletes: %{name}-system-unicore32-core <= %{epoch}:%{version}-%{release} Summary: QEMU is a FAST! processor emulator Name: qemu Version: 7.0.0 -Release: %{baserelease}%{?rcrel}.1.riscv64%{?dist} +Release: %{baserelease}%{?rcrel}.2.riscv64%{?dist} Epoch: 2 License: GPLv2 and BSD and MIT and CC-BY URL: http://www.qemu.org/ @@ -2477,8 +2477,8 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %{_bindir}/qemu-riscv64-static %{_datadir}/systemtap/tapset/qemu-riscv32-static.stp %{_datadir}/systemtap/tapset/qemu-riscv64-static.stp -%{_exec_prefix}/lib/binfmt.d/qemu-riscv32-static.conf %ifnarch riscv64 +%{_exec_prefix}/lib/binfmt.d/qemu-riscv32-static.conf %{_exec_prefix}/lib/binfmt.d/qemu-riscv64-static.conf %endif @@ -2724,6 +2724,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog +* Tue Jul 19 2022 David Abdurachmanov - 7.0.0-6.2.riscv64 +- Do not package qemu-riscv32-static.conf (doesn't exist on riscv64) + * Mon Jul 18 2022 David Abdurachmanov - 7.0.0-6.1.riscv64 - Disable tests (some hand with futex endless loop)