diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/files/0001-eclass-trick.patch b/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/files/0001-eclass-trick.patch deleted file mode 100644 index 3a66228dfc7..00000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/files/0001-eclass-trick.patch +++ /dev/null @@ -1,40 +0,0 @@ -From b91011089663e9633e0f0866eff618f8b6d16b3d Mon Sep 17 00:00:00 2001 -From: Kai Lueke -Date: Tue, 15 Nov 2022 18:55:42 +0100 -Subject: [PATCH] Workaround for the gentoo eclass - ---- - Cargo.lock | 3 ++- - Cargo.toml | 2 +- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/Cargo.lock b/Cargo.lock -index f9e965e..f3827fc 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -155,7 +155,8 @@ dependencies = [ - [[package]] - name = "openssh-keys" - version = "0.5.1-alpha.0" --source = "git+https://github.com/pothos/openssh-keys?branch=add-sk-keys#66e2295928e09c596ba258482b0fad78f50d167b" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "91103a05342d53a67cf387a8610e523347143a4230814f385d31759431ddfa8d" - dependencies = [ - "base64", - "byteorder", -diff --git a/Cargo.toml b/Cargo.toml -index 1ff4f81..5ff86d7 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -14,7 +14,7 @@ clap = "2.33" - fs2 = "0.4" - # Public dependencies, exposed through library API. - error-chain = { version = "0.12", default-features = false } --openssh-keys = { git = "https://github.com/pothos/openssh-keys", branch = "add-sk-keys" } -+openssh-keys = "0.5.1-alpha.0" - users = "0.9" - - [[bin]] --- -2.38.1 - diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-0.3.0-r7.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-0.3.0-r8.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-0.3.0-r7.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-0.3.0-r8.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-9999.ebuild index c4e4851cd03..6e3f48768d3 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-9999.ebuild @@ -10,12 +10,11 @@ CROS_WORKON_REPO="https://github.com" if [[ ${PV} == 9999 ]]; then KEYWORDS="~amd64 ~arm64" else - CROS_WORKON_COMMIT="5be7dcf3415f59afb8e78d7061a854f7b0efffc9" # flatcar-master + CROS_WORKON_COMMIT="de1e0d83c9a9279cf85d74c1d34f790d4a87bea8" # flatcar-master KEYWORDS="amd64 arm64" fi PATCHES=( - "${FILESDIR}"/0001-eclass-trick.patch ) # sed -n 's/^"checksum \([^ ]*\) \([^ ]*\) .*/\1-\2/p' Cargo.lock