From 51302c8c8bbf308a4cb1c5b73d950c7c5c424582 Mon Sep 17 00:00:00 2001
From: Packit Service <user-cont-team+packit-service@redhat.com>
Date: Apr 13 2021 22:53:05 +0000
Subject: Source-git repo for imports/c8s/osbuild-27.2-1.el8


---

diff --git a/.packit.yaml b/.packit.yaml
index bc549a3..3972250 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -8,6 +8,6 @@ jobs:
     targets: *id001
   trigger: pull_request
 sources:
-- {path: osbuild-27.1.tar.gz, url: 'https://git.centos.org/sources/osbuild/c8s/94c92fbda1b22a44f004749f53896f5ba35a3787'}
+- {path: osbuild-27.2.tar.gz, url: 'https://git.centos.org/sources/osbuild/c8s/781efd5f4d96e25059c002a7e998429b9d682d03'}
 specfile_path: SPECS/osbuild.spec
 upstream_ref: c8s-source-git
diff --git a/NEWS.md b/NEWS.md
index 68b0d5f..5e5a7be 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,14 @@
 # OSBuild - Build-Pipelines for Operating System Artifacts
 
+## CHANGES WITH 27.2:
+
+ * Add a new option to the `org.osbuild.qemu` assembler that controls
+   the qcow2 format version (`qcow2_compat`).
+
+Contributions from: Christian Kellner
+
+— Berlin, 2021-04-07
+
 ## CHANGES WITH 27.1:
 
  * Add history entries to the layers of OCI archives produced by the
diff --git a/SPECS/osbuild.spec b/SPECS/osbuild.spec
index 582152f..642005a 100644
--- a/SPECS/osbuild.spec
+++ b/SPECS/osbuild.spec
@@ -1,7 +1,7 @@
 %global         forgeurl https://github.com/osbuild/osbuild
 %global         selinuxtype targeted
 
-Version:        27.1
+Version:        27.2
 
 %forgemeta
 
@@ -190,6 +190,10 @@ fi
 
 
 %changelog
+* Thu Apr  8 2021 Christian Kellner <ckellner@redhat.com> - 27.2-1
+- Upstream release 27.2.
+- Support for explicitly selecting the qcow2 version.
+
 * Thu Apr 1 2021 Achilleas Koutsou <akoutsou@redhat.com> - 27.1-1
 - Upstream release 27.1
 - Bug fixes related to OCI archive generation.
diff --git a/assemblers/org.osbuild.qemu b/assemblers/org.osbuild.qemu
index e6bb648..ecee845 100755
--- a/assemblers/org.osbuild.qemu
+++ b/assemblers/org.osbuild.qemu
@@ -59,6 +59,10 @@ SCHEMA = """
     "type": "string",
     "enum": ["raw", "raw.xz", "qcow2", "vdi", "vmdk", "vpc", "vhdx"]
   },
+  "qcow2_compat": {
+    "description": "The qcow2-compatibility-version to use",
+    "type": "string"
+  },
   "filename": {
     "description": "Image filename",
     "type": "string"
@@ -690,6 +694,11 @@ def main(tree, output_dir, options, loop_client):
             "vpc": ["-o", "subformat=fixed,force_size"],
             "vhdx": []
         }
+
+        compat = options.get("qcow2_compat")
+        if compat:
+            extra_args["qcow2"] += ["-o", f"compat={compat}"]
+
         subprocess.run([
             "qemu-img",
             "convert",
diff --git a/osbuild.spec b/osbuild.spec
index 50d9eae..3b5eb67 100644
--- a/osbuild.spec
+++ b/osbuild.spec
@@ -1,7 +1,7 @@
 %global         forgeurl https://github.com/osbuild/osbuild
 %global         selinuxtype targeted
 
-Version:        27.1
+Version:        27.2
 
 %forgemeta
 
diff --git a/setup.py b/setup.py
index 5da7d7b..1b1764f 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ import setuptools
 
 setuptools.setup(
     name="osbuild",
-    version="27.1",
+    version="27.2",
     description="A build system for OS images",
     packages=["osbuild", "osbuild.formats", "osbuild.util"],
     license='Apache-2.0',