From 5b7f443076a5288bb1983e10eb1638044a6fbe37 Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Date: Tue, 29 Aug 2023 14:43:06 +0200
Subject: [PATCH] overlay coreos-base/oem-ec2-compat: drop ec2 use

while this ebuild will be dropped in the near future, we still need to
maintain openstack ebuild.

`flatcar-eks` was a runtime dependency of openstack/brightbox too. I
think it was a mistake ?

Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
---
 .../oem-ec2-compat/files/base/base-ec2.ign    | 46 -------------------
 .../oem-ec2-compat-0.1.2-r3.ebuild            | 23 ++--------
 2 files changed, 4 insertions(+), 65 deletions(-)
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/base/base-ec2.ign

diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/base/base-ec2.ign b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/base/base-ec2.ign
deleted file mode 100644
index 06b71bd3112..00000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/base/base-ec2.ign
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "ignition": {
-    "version": "2.1.0"
-  },
-  "systemd": {
-    "units": [
-      {
-        "name": "coreos-metadata-sshkeys@.service",
-        "enabled": true
-      },
-      {
-        "name": "amazon-ssm-agent.service",
-        "enabled": true,
-        "contents": "[Unit]\nDescription=amazon-ssm-agent\nAfter=network-online.target\n\n[Service]\nType=simple\nWorkingDirectory=/oem\nExecStart=/oem/bin/amazon-ssm-agent\nKillMode=process\nRestart=on-failure\nRestartForceExitStatus=SIGPIPE\nRestartSec=15min\n\n[Install]\nWantedBy=multi-user.target\n"
-      }
-    ]
-  },
-  "storage": {
-    "files": [
-      {
-        "filesystem": "root",
-        "path": "/etc/amazon/ssm/amazon-ssm-agent.json",
-        "contents": {
-          "source": "oem:///ssm/amazon-ssm-agent.json.template"
-        },
-        "mode": 292
-      },
-      {
-        "filesystem": "root",
-        "path": "/etc/amazon/ssm/seelog.xml",
-        "contents": {
-          "source": "oem:///ssm/seelog.xml.template"
-        },
-        "mode": 292
-      },
-      {
-        "filesystem": "root",
-        "path": "/etc/eks/bootstrap.sh",
-        "contents": {
-          "source": "oem:///eks/bootstrap.sh"
-        },
-        "mode": 493
-      }
-    ]
-  }
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2-r3.ebuild
index d6b1bc7a845..a717f398b16 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2-r3.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2-r3.ebuild
@@ -10,24 +10,15 @@ SRC_URI=""
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 arm64 x86"
-IUSE="ec2 openstack brightbox"
-REQUIRED_USE="^^ ( ec2 openstack brightbox )"
-
-RDEPEND="
-	ec2? ( app-emulation/amazon-ssm-agent )
-	coreos-base/flatcar-eks
-"
+IUSE="openstack brightbox"
+REQUIRED_USE="^^ ( openstack brightbox )"
 
 # no source directory
 S="${WORKDIR}"
 
 src_prepare() {
 	default
-	if use ec2 ; then
-		ID="ami"
-		NAME="Amazon EC2"
-		HOME_URL="http://aws.amazon.com/ec2/"
-	elif use openstack ; then
+	if use openstack ; then
 		ID="openstack"
 		NAME="Openstack"
 		HOME_URL="https://www.openstack.org/"
@@ -49,9 +40,7 @@ src_prepare() {
 src_install() {
 	insinto "/oem"
 	doins "${T}/oem-release"
-	if use ec2 ; then
-		newins "${FILESDIR}/grub-ec2.cfg" grub.cfg
-	elif use openstack ; then
+	if use openstack ; then
 		newins "${FILESDIR}/grub-openstack.cfg" grub.cfg
 	elif use brightbox ; then
 		newins "${FILESDIR}/grub-brightbox.cfg" grub.cfg
@@ -59,10 +48,6 @@ src_install() {
 
 	insinto "/oem/base"
 	doins "${FILESDIR}/base/README"
-	if use ec2 ; then
-		newins "${FILESDIR}/base/base-ec2.ign" base.ign
-	fi
-
 	if use openstack; then
 		newins "${FILESDIR}/base/openstack.ign" base.ign
 	fi