import osbuild-35-3.el8

SOURCES/qemu-fix-compat-option.patch

@@ -0,0 +1,29 @@
+From 21ad9fa3992ba0f28750b5808cebdacdde104e08 Mon Sep 17 00:00:00 2001
+From: Christian Kellner <christian@kellner.me>
+Date: Wed, 22 Sep 2021 10:30:52 +0000
+Subject: [PATCH] stages/qemu: fix 'compat' option
+
+The option got renamed to `compat` (and moved into the `qemu`
+object) when the stage was extracted from the `qemu` assembler;
+but the code, taken from the assembler, still used the old
+`qcow2_compat` name for the option. Fix this.
+---
+ stages/org.osbuild.qemu | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/stages/org.osbuild.qemu b/stages/org.osbuild.qemu
+index bfefac3..cb6b3a8 100755
+--- a/stages/org.osbuild.qemu
++++ b/stages/org.osbuild.qemu
+@@ -126,7 +126,7 @@ SCHEMA_2 = r"""
+ 
+ def qcow2_arguments(options):
+     argv = ["-c"]
+-    compat = options.get("qcow2_compat")
++    compat = options.get("compat")
+ 
+     if compat:
+         argv += ["-o", f"compat={compat}"]
+-- 
+2.32.0
+

SPECS/osbuild.spec

@@ -9,7 +9,7 @@ Version:        35
 %global         pkgdir %{_prefix}/lib/%{pypi_name}
 
 Name:           %{pypi_name}
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        ASL 2.0
 
 URL:            %{forgeurl}
@@ -20,6 +20,8 @@ Source0:        %{forgesource}
 Patch0:         ostree-bootloader-backend.patch
 # https://github.com/osbuild/osbuild/pull/795
 Patch1:         rhsm-none-check.patch
+# https://github.com/osbuild/osbuild/pull/819
+Patch2:         qemu-fix-compat-option.patch
 
 BuildArch:      noarch
 Summary:        A build system for OS images
@@ -108,6 +110,7 @@ manifests and osbuild.
 %forgesetup
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %py3_build
@@ -214,6 +217,10 @@ fi
 %{_bindir}/osbuild-mpp
 
 %changelog
+* Fri Sep 24 2021 Ondřej Budai <obudai@redhat.com> - 35-3
+- Include patch for qemu stage to fix the compat option that was
+  just ignored before.
+
 * Tue Sep 14 2021 Christian Kellner <gicmo@redhat.com> - 35-2
 - Include patch for ostree.config stage to support the selection of
   the bootloader backend.