From ae33d37698de5c162c64e381a96fb558d3f7f8d2 Mon Sep 17 00:00:00 2001
From: Christian Kellner <christian@kellner.me>
Date: Wed, 10 Feb 2021 17:53:02 +0000
Subject: [PATCH] stages/rpm: add format version 2 support

Explicitly declare the schema for version 2. Notable differences
are the declaration of the `packages` input as well is the lack
of that property in `options`.
---
 stages/org.osbuild.rpm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/stages/org.osbuild.rpm b/stages/org.osbuild.rpm
index 446dad37..d6c0fe27 100755
--- a/stages/org.osbuild.rpm
+++ b/stages/org.osbuild.rpm
@@ -79,6 +79,32 @@ SCHEMA = """
 """
 
 
+SCHEMA_2 = """
+"options": {
+  "type": "object",
+  "additionalProperties": false,
+  "properties": {
+    "gpgkeys": {
+      "description": "Array of GPG key contents to import",
+      "type": "array",
+      "items": { "type": "string" }
+    }
+  }
+},
+"inputs": {
+  "type": "object",
+  "additionalProperties": false,
+  "required": ["packages"],
+  "properties": {
+    "packages": {
+      "type": "object",
+      "additionalProperties": true
+    }
+  }
+}
+"""
+
+
 def generate_package_metadata(tree):
     query = r"""\{
     "name": "%{NAME}",