From 8a6cbb88806d988b34bfabcf19643b0a3a6861e2 Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Date: Wed, 21 Dec 2022 17:28:38 +0100
Subject: [PATCH] sys-apps/ignition: bring back noop OEM

it mainly brings back Vagrant which was failing with Ignition 2.14.0
even if no Ignition is provided.

Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
---
 ...8-revert-internal-oem-drop-noop-OEMs.patch | 79 +++++++++++++++++++
 ....0-r5.ebuild => ignition-2.14.0-r6.ebuild} |  0
 .../sys-apps/ignition/ignition-9999.ebuild    |  1 +
 3 files changed, 80 insertions(+)
 create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-revert-internal-oem-drop-noop-OEMs.patch
 rename sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/{ignition-2.14.0-r5.ebuild => ignition-2.14.0-r6.ebuild} (100%)

diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-revert-internal-oem-drop-noop-OEMs.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-revert-internal-oem-drop-noop-OEMs.patch
new file mode 100644
index 0000000000..b665d00d27
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-revert-internal-oem-drop-noop-OEMs.patch
@@ -0,0 +1,79 @@
+From 1f7edd0e4d53f1bf6c07339293330b850bdeadf4 Mon Sep 17 00:00:00 2001
+From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
+Date: Wed, 21 Dec 2022 17:25:02 +0100
+Subject: [PATCH] revert: internal/oem: drop noop OEMs
+
+This reverts: https://github.com/coreos/ignition/commit/26828f92e00060aa8ebf2197545ad602af237132
+
+Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
+---
+ internal/platform/platform.go | 28 ++++++++++++++++++++++++++++
+ 1 file changed, 28 insertions(+)
+
+diff --git a/internal/platform/platform.go b/internal/platform/platform.go
+index 51bf5174..3169536c 100644
+--- a/internal/platform/platform.go
++++ b/internal/platform/platform.go
+@@ -132,6 +132,10 @@ func init() {
+ 		name:  "brightbox",
+ 		fetch: openstack.FetchConfig,
+ 	})
++	configs.Register(Config{
++		name:  "cloudsigma",
++		fetch: noop.FetchConfig,
++	})
+ 	configs.Register(Config{
+ 		name:  "cloudstack",
+ 		fetch: cloudstack.FetchConfig,
+@@ -152,10 +156,18 @@ func init() {
+ 		name:  "gcp",
+ 		fetch: gcp.FetchConfig,
+ 	})
++	configs.Register(Config{
++		name:  "hyperv",
++		fetch: noop.FetchConfig,
++	})
+ 	configs.Register(Config{
+ 		name:  "ibmcloud",
+ 		fetch: ibmcloud.FetchConfig,
+ 	})
++	configs.Register(Config{
++		name:  "interoute",
++		fetch: noop.FetchConfig,
++	})
+ 	configs.Register(Config{
+ 		name:  "kubevirt",
+ 		fetch: kubevirt.FetchConfig,
+@@ -164,6 +176,10 @@ func init() {
+ 		name:  "metal",
+ 		fetch: noop.FetchConfig,
+ 	})
++	configs.Register(Config{
++		name:  "niftycloud",
++		fetch: noop.FetchConfig,
++	})
+ 	configs.Register(Config{
+ 		name:  "nutanix",
+ 		fetch: nutanix.FetchConfig,
+@@ -185,6 +201,18 @@ func init() {
+ 		name:  "qemu",
+ 		fetch: qemu.FetchConfig,
+ 	})
++	configs.Register(Config{
++		name:  "rackspace",
++		fetch: noop.FetchConfig,
++	})
++	configs.Register(Config{
++		name:  "rackspace-onmetal",
++		fetch: noop.FetchConfig,
++	})
++	configs.Register(Config{
++		name:  "vagrant",
++		fetch: noop.FetchConfig,
++	})
+ 	configs.Register(Config{
+ 		name:      "virtualbox",
+ 		fetch:     virtualbox.FetchConfig,
+-- 
+2.35.1
+
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.14.0-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.14.0-r6.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.14.0-r5.ebuild
rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.14.0-r6.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild
index 3def4974c7..26ad7c169a 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild
@@ -59,6 +59,7 @@ PATCHES=(
 	"${FILESDIR}/0015-internal-resource-url-support-btrfs-as-OEM-partition.patch"
 	"${FILESDIR}/0016-internal-exec-stages-disks-prevent-races-with-udev.patch"
 	"${FILESDIR}/0017-translation-support-OEM-and-oem.patch"
+	"${FILESDIR}/0018-revert-internal-oem-drop-noop-OEMs.patch"
 )
 
 src_compile() {