diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/app-portage/gentoolkit/0001-profile-Default-to-main-repo-name.patch b/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/app-portage/gentoolkit/0001-profile-Default-to-main-repo-name.patch deleted file mode 100644 index 2483329d48..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/app-portage/gentoolkit/0001-profile-Default-to-main-repo-name.patch +++ /dev/null @@ -1,55 +0,0 @@ -From b8396c72055ecc90b1a0e824b517a50cee9a843c Mon Sep 17 00:00:00 2001 -From: Krzesimir Nowak -Date: Thu, 8 Dec 2022 16:25:39 +0100 -Subject: [PATCH] profile: Default to main repo name - -In Flatcar we have a different repo marked as a default one -(portage-stable), so "equery keywords" was crashing because it was -trying to use gentoo repo anyways. - -Signed-off-by: Krzesimir Nowak -Closes: https://github.com/gentoo/gentoolkit/pull/24 -Signed-off-by: Sam James ---- - pym/gentoolkit/profile.py | 15 ++++++++++----- - 1 file changed, 10 insertions(+), 5 deletions(-) - -diff --git a/pym/gentoolkit/profile.py b/pym/gentoolkit/profile.py -index f6943be..7469138 100644 ---- a/pym/gentoolkit/profile.py -+++ b/pym/gentoolkit/profile.py -@@ -21,21 +21,26 @@ def warning(msg): - print("warning: %s" % msg, file=sys.stderr) - - --def load_profile_data(portdir=None, repo="gentoo"): -+def load_profile_data(portdir=None, repo=""): - """Load the list of known arches from the tree - - Args: - portdir: The repository to load all data from (and ignore |repo|) -- repo: Look up this repository by name to locate profile data -+ repo: Look up this repository by name to locate profile data (if empty, uses main repo name) - - Returns: - A dict mapping the keyword to its preferred state: - {'x86': ('stable', 'arch'), 'mips': ('dev', '~arch'), ...} - """ - if portdir is None: -- portdir = ( -- portage.db[portage.root]["vartree"].settings.repositories[repo].location -- ) -+ repos = portage.db[portage.root]["vartree"].settings.repositories -+ if repo == "": -+ main_repo = repos.mainRepo() -+ if main_repo is None: -+ repo = "gentoo" -+ else: -+ repo = main_repo.name -+ portdir = repos[repo].location - - arch_status = {} - --- -2.25.1 - diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/app-portage/gentoolkit/README.md b/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/app-portage/gentoolkit/README.md deleted file mode 100644 index fbdc106104..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/app-portage/gentoolkit/README.md +++ /dev/null @@ -1 +0,0 @@ -Drop `0001-profile-Default-to-main-repo-name.patch` when we have gentoolkit 0.6.2 or greater.