Migrate (almost) all versioned coreos-overlay ebuilds away from git eclass

.github/workflows/portage-stable-packages-list

@@ -151,6 +151,7 @@ app-editors/nano
 app-editors/vim
 app-editors/vim-core
 
+app-emulation/open-vmdk
 app-emulation/qemu
 app-emulation/qemu-guest-agent
 app-emulation/virt-firmware

build_library/build_image_util.sh

@@ -304,13 +304,12 @@ get_metadata() {
     if [ "${key}" = "SRC_URI" ]; then
         local package_name="$(echo "${pkg%%:*}" | cut -d / -f 2)"
         local ebuild_path="${prefix}/var/db/pkg/${pkg%%:*}/${package_name}.ebuild"
-        # SRC_URI is empty for the special github.com/flatcar projects
         if [ -z "${val}" ]; then
             # The grep invocation gives errors when the ebuild file is not present.
             # This can happen when the binary packages from ./build_packages are outdated.
             val="$(grep "EGIT_REPO_URI=" "${ebuild_path}" | cut -d '"' -f 2)"
             if [ -n "${val}" ]; then
-                # All github.com/flatcar projects specify their commit
+                # If using git, then the package was probably pinned to a commit.
                 local commit=""
                 commit="$(grep "EGIT_COMMIT=" "${ebuild_path}" | cut -d '"' -f 2)"
                 if [ -n "${commit}" ]; then
@@ -323,10 +322,6 @@ get_metadata() {
             # Do not attempt to postprocess by resolving ${P} and friends because it does not affect production images
             val="$(cat "${ebuild_path}" | tr '\n' ' ' | grep -P -o 'SRC_URI=".*?"' | cut -d '"' -f 2)"
         fi
-        # Some packages use nothing from the above but EGIT_REPO_URI (currently only app-crypt/go-tspi)
-        if [ -z "${val}" ]; then
-            val="$(grep "EGIT_REPO_URI=" "${ebuild_path}" | cut -d '"' -f 2)"
-        fi
         # Replace all mirror://MIRRORNAME/ parts with the actual URL prefix of the mirror
         new_val=""
         for v in ${val}; do

flatcar_workon

@@ -166,7 +166,7 @@ list() {
   return 0
 }
 
-case "$1" in
+case "${1-}" in
   start)
     find_ebuild "${2-}"
     start ;;
@@ -177,5 +177,5 @@ case "$1" in
     list ;;
   *)
     flags_help
-    die "$0: command \"$1\" not recognized" ;;
+    [[ ${1-} ]] && die "$0: command \"$1\" not recognized" ;;
 esac

run_sdk_container

@@ -140,7 +140,7 @@ if [[ -z ${stat} ]] ; then
     docker_flags=(
         "${tty[@]}"
         -i
-        --mount type=tmpfs,destination=/tmp
+        --tmpfs /tmp:exec
         -v /dev:/dev
         -v "${PWD}/sdk_container:/mnt/host/source/"
         -v "${PWD}/__build__/images:/mnt/host/source/src/build"

sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/Manifest

@@ -0,0 +1 @@
+DIST locksmith-a1cb1f901971165827d68188e9f60752c0e33c10.tar.gz 239087 BLAKE2B f37e5cfcdad269f10b5c6f6f37365719f3a86cbe70ecf1c207e0e88129671b5d122170299eed5829a0b18ff1edd3d3e3f452efca207e819d646a4538c1820706 SHA512 79fe435d3efdaca7fec442701338b9dcc50b261e65d9628a3a0b69001f6bfadf4b4bf85f52d6025d4c3b04283b870423f23318bd275030032a34f5d9a82d1389

sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-9999.ebuild

@@ -1,35 +1,35 @@
 # 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/locksmith.git"
+EAPI=8
+
 COREOS_GO_PACKAGE="github.com/flatcar/locksmith"
-inherit git-r3 systemd coreos-go
+inherit systemd coreos-go
+
+DESCRIPTION="Reboot manager for the Flatcar update engine"
+HOMEPAGE="https://github.com/flatcar/locksmith"
 
-if [[ "${PV}" == 9999 ]]; then
-	KEYWORDS="~amd64 ~arm64"
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/flatcar/locksmith.git"
+	inherit git-r3
 else
-	EGIT_COMMIT="ee644fc60a32af5fbc4e83c64fcc7ca0eadb9e3f" # flatcar-master
+	EGIT_VERSION="a1cb1f901971165827d68188e9f60752c0e33c10" # flatcar-master
+	SRC_URI="https://github.com/flatcar/locksmith/archive/${EGIT_VERSION}.tar.gz -> ${PN}-${EGIT_VERSION}.tar.gz"
+	S="${WORKDIR}/${PN}-${EGIT_VERSION}"
 	KEYWORDS="amd64 arm64"
 fi
 
-DESCRIPTION="locksmith"
-HOMEPAGE="https://github.com/flatcar/locksmith"
-SRC_URI=""
-
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE=""
 
 src_compile() {
 	COREOS_GO_MOD=vendor go_build "${COREOS_GO_PACKAGE}/locksmithctl"
 }
 
 src_install() {
-	dobin ${GOBIN}/locksmithctl
-	dodir /usr/lib/locksmith
+	dobin "${GOBIN}"/locksmithctl
 	dosym ../../../bin/locksmithctl /usr/lib/locksmith/locksmithd
 
-	systemd_dounit "${S}"/systemd/locksmithd.service
+	systemd_dounit systemd/locksmithd.service
 	systemd_enable_service multi-user.target locksmithd.service
 }

sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/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/locksmith</remote-id>
+	</upstream>
 </pkgmetadata>

sdk_container/src/third_party/coreos-overlay/app-admin/mayday/Manifest

@@ -0,0 +1 @@
+DIST mayday-ae784704884e85de795a56752a9a10f1ff13be15.tar.gz 1887053 BLAKE2B b64ca02ab64eb3dd15b40d3dc160aa29a13ff84afa2580e84d21802576c8b8d8099158aee832e302f163e1a7ad9e4df2de22fffb8f7c6ea8e2e8683b8ebec573 SHA512 cd3818b08bde1d854128bcdb97dc92a4857f24968212d17a3bd2f43191433dfea4ee1658d2575eb9be92525a55952e3e25a7841a11ab657621b8bc45d3581fd6

sdk_container/src/third_party/coreos-overlay/app-admin/mayday/mayday-9999.ebuild

@@ -1,33 +1,33 @@
 # Copyright (c) 2015 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/mayday.git"
+EAPI=8
+
 COREOS_GO_PACKAGE="github.com/flatcar/mayday"
-inherit coreos-go git-r3
+inherit coreos-go
 
-if [[ "${PV}" == 9999 ]]; then
-    KEYWORDS="~amd64 ~arm64"
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/flatcar/mayday.git"
+	inherit git-r3
 else
-    EGIT_COMMIT="8b9adcf261d13d395659ed839b3ba0af52bd117a" # main
-    KEYWORDS="amd64 arm64"
+	EGIT_VERSION="ae784704884e85de795a56752a9a10f1ff13be15" # main
+	SRC_URI="https://github.com/flatcar/mayday/archive/${EGIT_VERSION}.tar.gz -> ${PN}-${EGIT_VERSION}.tar.gz"
+	S="${WORKDIR}/${PN}-${EGIT_VERSION}"
+	KEYWORDS="amd64 arm64"
 fi
 
-DESCRIPTION="mayday"
+DESCRIPTION="Tool to simplify gathering support information"
 HOMEPAGE="https://github.com/flatcar/mayday"
-SRC_URI=""
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE=""
 
 src_compile() {
 	COREOS_GO_MOD=vendor go_build "${COREOS_GO_PACKAGE}"
 }
 
 src_install() {
-	newbin ${GOBIN}/mayday mayday
+	dobin "${GOBIN}"/mayday
 	insinto /usr/share/mayday
-	doins "${S}/default.json"
+	doins default.json
 }
-

sdk_container/src/third_party/coreos-overlay/app-admin/mayday/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/mayday</remote-id>
+	</upstream>
 </pkgmetadata>

sdk_container/src/third_party/coreos-overlay/app-admin/sdnotify-proxy/Manifest

@@ -0,0 +1 @@
+DIST sdnotify-proxy-0f8ef1aa86c59fc6d54eadaffb248feaccd1018b.tar.gz 7698 BLAKE2B 5abaac2c9fca1736bd093534714e1a17d4c49f4ae2f7bf1a0dcbbc07d493d9253714383d20b15f76dd2507babc4baea27201d262dec0df5aff280f60d050c8c2 SHA512 55940b2f528cbff05932164d5f246482ebd4aca24d913a4bcc9bc076ea4c4a8014b51440c593040f3b79cb138e18b8c4a2856929750dc690f36b4b79b4c5fc9c

sdk_container/src/third_party/coreos-overlay/app-admin/sdnotify-proxy/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/sdnotify-proxy</remote-id>
+	</upstream>
 </pkgmetadata>

sdk_container/src/third_party/coreos-overlay/app-admin/sdnotify-proxy/sdnotify-proxy-9999.ebuild

@@ -1,29 +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/sdnotify-proxy.git"
+EAPI=8
+
 COREOS_GO_PACKAGE="github.com/flatcar/sdnotify-proxy"
 COREOS_GO_GO111MODULE="off"
-inherit coreos-go git-r3
+inherit coreos-go
+
+DESCRIPTION="Hack to allow Docker containers to use sd_notify"
+HOMEPAGE="https://github.com/flatcar/sdnotify-proxy"
 
-if [[ "${PV}" == 9999 ]]; then
-	KEYWORDS="~amd64 ~arm64"
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/flatcar/sdnotify-proxy.git"
+	inherit git-r3
 else
-	EGIT_COMMIT="0f8ef1aa86c59fc6d54eadaffb248feaccd1018b" # main
+	EGIT_VERSION="0f8ef1aa86c59fc6d54eadaffb248feaccd1018b" # main
+	SRC_URI="https://github.com/flatcar/sdnotify-proxy/archive/${EGIT_VERSION}.tar.gz -> ${PN}-${EGIT_VERSION}.tar.gz"
+	S="${WORKDIR}/${PN}-${EGIT_VERSION}"
 	KEYWORDS="amd64 arm64"
 fi
 
-DESCRIPTION="sdnotify-proxy"
-HOMEPAGE="https://github.com/flatcar/sdnotify-proxy"
-SRC_URI=""
-
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE=""
 
 src_install() {
-	# Put sdnotify-proxy into its well-know location.
 	exeinto /usr/libexec
-	doexe ${GOBIN}/sdnotify-proxy
+	doexe "${GOBIN}"/sdnotify-proxy
 }

sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/Manifest

@@ -0,0 +1 @@
+DIST toolbox-a33dd49910b9208bcb835662308242494446a0ff.tar.gz 11780 BLAKE2B a12731927492fe118a4d1bae0c43b6d79297dcc25f312dc95045abeebe9b8701948ae95a6c15108ea50ceb81b680a913b0149b59f4444dc939dc8f4b2c3997dc SHA512 537fca7dc3b92715cf88cfb70708e3172c872cbf892433b16c22412086830771b140f0d1455e3747759b45405114662584b5f629c5b065ff1f89a1c363b4da5d

sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/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/toolbox</remote-id>
+	</upstream>
 </pkgmetadata>

sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/toolbox-9999.ebuild

@@ -1,26 +1,24 @@
 # 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/toolbox.git"
+EAPI=8
 
-if [[ "${PV}" == 9999 ]]; then
-	KEYWORDS="~amd64 ~arm64"
+DESCRIPTION="Launches a container to bring in your favorite debugging or admin tools"
+HOMEPAGE="https://github.com/flatcar/toolbox"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/flatcar/toolbox.git"
+	inherit git-r3
 else
-	EGIT_COMMIT="2fae95b467d6961a396b88d6aa20a9d6bee943c6" # main
+	EGIT_VERSION="a33dd49910b9208bcb835662308242494446a0ff" # main
+	SRC_URI="https://github.com/flatcar/toolbox/archive/${EGIT_VERSION}.tar.gz -> ${PN}-${EGIT_VERSION}.tar.gz"
+	S="${WORKDIR}/${PN}-${EGIT_VERSION}"
 	KEYWORDS="amd64 arm64"
 fi
 
-inherit git-r3
-
-DESCRIPTION="toolbox"
-HOMEPAGE="https://github.com/flatcar/toolbox"
-SRC_URI=""
-
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE=""
 
 src_install() {
-	dobin ${S}/toolbox
+	dobin toolbox
 }

sdk_container/src/third_party/coreos-overlay/app-admin/updateservicectl/Manifest

@@ -0,0 +1 @@
+DIST updateservicectl-bfcb21e4c5ef7077231ef1d879c867f1655da09a.tar.gz 109928 BLAKE2B a9757d3ddd2430e99097ce588ece0bfd807b1af8a7fa5db23e5ce0941cd27c1e976ed22c98ee18c3b15f9cef61eb52d918c1861566897b7f6290222e0ce1b881 SHA512 2e8eaebf706e2513b34b629071f58bcdf1d01749f866b2a5e089fa8c57195c63f800fd6882b5e29c5242d12114fbe8e5553a0d404e1552b893b93c941c516f56

sdk_container/src/third_party/coreos-overlay/app-admin/updateservicectl/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/updateservicectl</remote-id>
+	</upstream>
 </pkgmetadata>

sdk_container/src/third_party/coreos-overlay/app-admin/updateservicectl/updateservicectl-9999.ebuild

@@ -1,30 +1,24 @@
 # 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/updateservicectl.git"
+EAPI=8
+
 COREOS_GO_PACKAGE="github.com/flatcar/updateservicectl"
 COREOS_GO_GO111MODULE="on"
-inherit git-r3 coreos-go
+inherit coreos-go
 
-if [[ "${PV}" == 9999 ]]; then
-	KEYWORDS="~amd64 ~arm64"
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/flatcar/updateservicectl.git"
+	inherit git-r3
 else
-	EGIT_COMMIT="446f13594465503a3fdfc9106fd8a0c3123249c2" # main
+	EGIT_VERSION="bfcb21e4c5ef7077231ef1d879c867f1655da09a" # main
+	SRC_URI="https://github.com/flatcar/updateservicectl/archive/${EGIT_VERSION}.tar.gz -> ${PN}-${EGIT_VERSION}.tar.gz"
+	S="${WORKDIR}/${PN}-${EGIT_VERSION}"
 	KEYWORDS="amd64 arm64"
 fi
 
-DESCRIPTION="CoreUpdate Management CLI"
+DESCRIPTION="Flatcar Container Linux update service CLI"
 HOMEPAGE="https://github.com/flatcar/updateservicectl"
-SRC_URI=""
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE=""
-
-RDEPEND="!app-admin/updatectl"
-
-src_prepare() {
-	coreos-go_src_prepare
-	GOPATH+=":${S}/Godeps/_workspace"
-}

sdk_container/src/third_party/coreos-overlay/app-crypt/go-tspi/Manifest

@@ -0,0 +1 @@
+DIST go-tspi-27182e3e7b1dfcfb398b5408a619abc4f652a38b.tar.gz 36280 BLAKE2B 4736f354834fe31212c8530e287bb0dd36f3bdb560e4501492c14204078ca411bb53d1578012bbe08a3c27f1c5f8d345d6364d2a1f51483dce6797ae54d3968c SHA512 06f05b0abfdcfd2572607d19903338167992d60197c156638daa4a593508e6203727d260d8140cff13f280bf89db0a29fd97837b17acf77ccf6a1c61ff696977

sdk_container/src/third_party/coreos-overlay/app-crypt/go-tspi/go-tspi-9999.ebuild

@@ -1,31 +1,37 @@
-EAPI=7
+# Copyright 2025 The Flatcar Container Linux Maintainers
+# Distributed under the terms of the Apache License 2.0
 
-inherit coreos-go git-r3 systemd
+EAPI=8
+
+inherit coreos-go systemd
 COREOS_GO_PACKAGE="github.com/coreos/go-tspi"
 COREOS_GO_GO111MODULE="off"
-EGIT_REPO_URI="https://github.com/coreos/go-tspi.git"
 
-if [[ "${PV}" == 9999 ]]; then
-        KEYWORDS="~amd64 ~arm64"
+DESCRIPTION="Go bindings and support code for libtspi and TPM communication"
+HOMEPAGE="https://github.com/google/go-tspi"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/google/go-tspi.git"
+	inherit git-r3
 else
-        EGIT_COMMIT="27182e3e7b1dfcfb398b5408a619abc4f652a38b"
-        KEYWORDS="amd64 arm64"
+	EGIT_VERSION="27182e3e7b1dfcfb398b5408a619abc4f652a38b"
+	SRC_URI="https://github.com/google/go-tspi/archive/${EGIT_VERSION}.tar.gz -> ${PN}-${EGIT_VERSION}.tar.gz"
+	S="${WORKDIR}/${PN}-${EGIT_VERSION}"
+	KEYWORDS="amd64 arm64"
 fi
 
-IUSE=""
-
 LICENSE="Apache-2.0"
 SLOT="0"
 
 RDEPEND="app-crypt/trousers"
 DEPEND="${RDEPEND}"
 
 src_compile() {
-	      go_build "${COREOS_GO_PACKAGE}/tpmd"
-      	      go_build "${COREOS_GO_PACKAGE}/tpmown"
+	go_build "${COREOS_GO_PACKAGE}"/tpmd
+	go_build "${COREOS_GO_PACKAGE}"/tpmown
 }
 
 src_install() {
-	dobin ${GOBIN}/*
+	dobin "${GOBIN}"/*
 	systemd_dounit "${FILESDIR}"/tpmd.service
 }

sdk_container/src/third_party/coreos-overlay/app-emulation/open-vmdk/metadata.xml → sdk_container/src/third_party/coreos-overlay/app-crypt/go-tspi/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">google/go-tspi</remote-id>
+	</upstream>
 </pkgmetadata>