From 751404ff8ca3a76c89fe8b6057a7d8b11f5d8d26 Mon Sep 17 00:00:00 2001
From: James Le Cuirot <jlecuirot@microsoft.com>
Date: Mon, 22 Dec 2025 11:09:16 +0000
Subject: [PATCH] coreos-base/coreos-cloudinit: Migrate versioned ebuild from
 git eclass

Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
---
 .../coreos-base/coreos-cloudinit/Manifest     |  1 +
 .../coreos-cloudinit-9999.ebuild              | 30 +++++++++----------
 .../coreos-base/coreos-cloudinit/metadata.xml |  3 ++
 3 files changed, 18 insertions(+), 16 deletions(-)
 create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/Manifest

diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/Manifest b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/Manifest
new file mode 100644
index 0000000000..c64fd2e1f0
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/Manifest
@@ -0,0 +1 @@
+DIST coreos-cloudinit-1c1d7f4ae6b933350d7fd36e882dda170123cccc.tar.gz 310707 BLAKE2B 13cb6b452c71285983b6446ec4a40e24a862fe029744b0c66c39e7d0e69616343d70717e94f94ef152ab5a23bdef096bc46df4593ee679a340ef292b81d9df17 SHA512 b3fd07e1e5b26e530cd36cc33d06e5eeeb707ec3c0fef5126c51a4a8d7d68eed2b74aebb0777030fc595dcae3c22f9dffde8ceed914db7ce8323cf4ad22b9710
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild
index 5a37cd6380..c7e59e1bc3 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild
@@ -1,31 +1,29 @@
 # Copyright (c) 2014 CoreOS, Inc.. All rights reserved.
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-EGIT_REPO_URI="https://github.com/flatcar/coreos-cloudinit.git"
+EAPI=8
+
 COREOS_GO_PACKAGE="github.com/flatcar/coreos-cloudinit"
 COREOS_GO_GO111MODULE="on"
-inherit git-r3 systemd toolchain-funcs udev coreos-go
+inherit systemd toolchain-funcs udev coreos-go
 
-if [[ "${PV}" == 9999 ]]; then
-	KEYWORDS="~amd64 ~arm64"
+DESCRIPTION="Enables a user to customize Flatcar Container Linux machines"
+HOMEPAGE="https://github.com/flatcar/coreos-cloudinit"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/flatcar/coreos-cloudinit.git"
+	inherit git-r3
 else
-	EGIT_COMMIT="1c1d7f4ae6b933350d7fd36e882dda170123cccc" # main
+	EGIT_VERSION="1c1d7f4ae6b933350d7fd36e882dda170123cccc" # main
+	SRC_URI="https://github.com/flatcar/coreos-cloudinit/archive/${EGIT_VERSION}.tar.gz -> ${PN}-${EGIT_VERSION}.tar.gz"
+	S="${WORKDIR}/${PN}-${EGIT_VERSION}"
 	KEYWORDS="amd64 arm64"
 fi
 
-DESCRIPTION="coreos-cloudinit"
-HOMEPAGE="https://github.com/flatcar/coreos-cloudinit"
-SRC_URI=""
-
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE=""
 
-DEPEND="!<coreos-base/coreos-init-0.0.1-r69"
-RDEPEND="
-	>=sys-apps/shadow-4.1.5.1
-"
+RDEPEND=">=sys-apps/shadow-4.1.5.1"
 
 src_prepare() {
 	coreos-go_src_prepare
@@ -36,7 +34,7 @@ src_prepare() {
 }
 
 src_compile() {
-	GO_LDFLAGS="-X main.version=$(git describe --dirty)" || die
+	GO_LDFLAGS="-X main.version=v${PV}-g${EGIT_VERSION:0:7}" || die
 	coreos-go_src_compile
 }
 
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/metadata.xml b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/metadata.xml
index 097975e3ad..3981798353 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/metadata.xml
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/metadata.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<upstream>
+		<remote-id type="github">flatcar/coreos-cloudinit</remote-id>
+	</upstream>
 </pkgmetadata>