From 3fbb788524cee3f126a297c27600d50174f22653 Mon Sep 17 00:00:00 2001
From: Dongsu Park <dpark@linux.microsoft.com>
Date: Mon, 2 Dec 2024 17:09:34 +0100
Subject: [PATCH] coreos-overlay ue-rs: download and unpack tarball correctly

Now that the previous git clone method does not work any more with the
current eclass, we need to download source tarball directly from GitHub
archive, and specify source directory name correspondingly.
---
 .../third_party/coreos-overlay/coreos-base/ue-rs/Manifest  | 1 +
 .../coreos-overlay/coreos-base/ue-rs/ue-rs-9999.ebuild     | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/Manifest b/sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/Manifest
index a58ffd7410b..b99689dc13c 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/Manifest
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/Manifest
@@ -34,6 +34,7 @@ DIST env_logger-0.10.2.crate 36402 BLAKE2B 34ef02d0f53fea474e7284fd7021ed3b44b11
 DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140
 DIST errno-0.3.10.crate 11824 BLAKE2B f9976b538868daba3cd2d47ff2fdcda16b4a436ca767f865f23d1139e7f232aba263dd4aa38d573442c762999c8a8beab8a4a8c10649d21b49090fa65ced1ec7 SHA512 fa4b9a368f254cd90c6f69f6883af4c579829a6da6f31481a1b527ac9602c8ffcb5e9518cdc32c39b5589c151a20e75a7300c8a907d178346185ecc6e8749f3f
 DIST fastrand-2.2.0.crate 15031 BLAKE2B f3fe05ed1acfda1fbca7ebe3da2b26d05a35ab782db693ca58737dad537c53d16142422a04d2d55a6f9fa9a76abe4454923d85f6948601394f39cea5c90e835d SHA512 de2835aee8d5380a6e1c0f627a876594626e1379f2f7dbd3ad0f785d7c3f3f82162c9c20a68417324506f78264cb9dbcfb2d4d5dc9ca666996150979738822e4
+DIST flatcar-ue-rs-e48f7ec3756b222d15a3e63a29078bbdfa8080e9.tar.gz 79232 BLAKE2B 866e090911aac997fc3fbd22386f823e1ad987a791bddb04215a7bac01fb7d3e25309505905e93e894c9097ed5c39fbd2674951066082fac7fc5a584f95440ea SHA512 7e51dd8d49b08831bdbb58157ac88c2e861a966538613e42486a26fc65c375a6e12d06efb47476a4ef7839c97546115512262d2ae6857eb97066c3462a27b269
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
 DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/ue-rs-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/ue-rs-9999.ebuild
index f5aba9475f8..3ab0fc6cd51 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/ue-rs-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/ue-rs-9999.ebuild
@@ -6,11 +6,14 @@ EAPI=8
 EGIT_REPO_URI="https://github.com/flatcar/ue-rs.git"
 
 if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
 	KEYWORDS="~amd64 ~arm64"
 	CRATES=""
 else
 	EGIT_COMMIT="78381b1b1995f5cebfd2a36a70d616ce6ba538a4" # trunk
 	KEYWORDS="amd64 arm64"
+	SRC_URI="https://github.com/flatcar/${PN}/archive/${EGIT_COMMIT}.tar.gz -> flatcar-${PN}-${EGIT_COMMIT}.tar.gz"
+	S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 
 	CRATES="
 		addr2line@0.24.2
@@ -227,11 +230,11 @@ else
 	"
 fi
 
-inherit cargo git-r3
+inherit cargo
 
 DESCRIPTION="Prototype Omaha Rust implementation"
 HOMEPAGE="https://github.com/flatcar/ue-rs"
-SRC_URI="${CARGO_CRATE_URIS}"
+SRC_URI+=" ${CARGO_CRATE_URIS}"
 
 LICENSE="Apache-2.0"
 SLOT="0"