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 new file mode 100644 index 0000000000..4bb48fea1d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/app-portage/gentoolkit/0001-profile-Default-to-main-repo-name.patch @@ -0,0 +1,53 @@ +From e40cd8c76bee4f7c108c1066d60aaf5d8c3adede 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 | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +diff --git a/pym/gentoolkit/profile.py b/pym/gentoolkit/profile.py +index dcd02cc..c880137 100644 +--- a/pym/gentoolkit/profile.py ++++ b/pym/gentoolkit/profile.py +@@ -23,19 +23,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 new file mode 100644 index 0000000000..fbdc106104 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/app-portage/gentoolkit/README.md @@ -0,0 +1 @@ +Drop `0001-profile-Default-to-main-repo-name.patch` when we have gentoolkit 0.6.2 or greater.