From 48459db0764e9b9df537c492322355d5787e3a07 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 31 Jan 2025 16:18:48 +0530 Subject: [PATCH 1/2] RPM: adjust qemu dependencies We only need qemu-system-[x86|aarch64]-core based on the architecture along with qemu-img. So, there's no need to pull in all of qemu. The qemu-system-[x86|aarch64]-core packages are not present on CentOS Stream and RHEL, so we use qemu-kvm there instead. Ref: https://github.com/containers/podman/pull/24369/files#r1883658262 Signed-off-by: Lokesh Mandvekar --- rpm/podman.spec | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/rpm/podman.spec b/rpm/podman.spec index b27772fde3..26db8eaaff 100644 --- a/rpm/podman.spec +++ b/rpm/podman.spec @@ -24,6 +24,8 @@ %if %{defined fedora} %define build_with_btrfs 1 +# qemu-system* isn't packageed for CentOS Stream / RHEL +%define qemu 1 %endif %if %{defined copr_username} @@ -188,7 +190,17 @@ when `%{_bindir}/%{name}sh` is set as a login shell or set as os.Args[0]. Summary: Metapackage for setting up %{name} machine Requires: %{name} = %{epoch}:%{version}-%{release} Requires: gvisor-tap-vsock -Requires: qemu +%if %{defined qemu} +%ifarch aarch64 +Requires: qemu-system-aarch64-core +%endif +%ifarch x86_64 +Requires: qemu-system-x86-core +%endif +%else +Requires: qemu-kvm +%endif +Requires: qemu-img Requires: virtiofsd ExclusiveArch: x86_64 aarch64 From 5feb81d9fffe9456688ad846c8b39b18c14ad685 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 31 Jan 2025 17:15:17 +0530 Subject: [PATCH 2/2] RPM: include empty check to silence rpmlint Signed-off-by: Lokesh Mandvekar --- rpm/podman.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rpm/podman.spec b/rpm/podman.spec index 26db8eaaff..8e2635a304 100644 --- a/rpm/podman.spec +++ b/rpm/podman.spec @@ -309,6 +309,9 @@ ln -s ../virtiofsd %{buildroot}%{_libexecdir}/%{name} #define license tag if not already defined %{!?_licensedir:%global license %doc} +# Include empty check to silence rpmlint warning +%check + %files -f %{name}.file-list %license LICENSE vendor/modules.txt %doc README.md CONTRIBUTING.md install.md transfer.md