diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/sys-apps/pkgcore/0001-build-profiles-patch.patch b/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/sys-apps/pkgcore/0001-build-profiles-patch.patch new file mode 100644 index 0000000000..5d25d2dcbf --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/sys-apps/pkgcore/0001-build-profiles-patch.patch @@ -0,0 +1,28 @@ +From dd76e415b2a707d31a125201c5d21aadb07282a7 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot +Date: Tue, 11 Jun 2024 15:39:25 +0100 +Subject: [PATCH] ebuild.profiles: Fix case where a parent path omits the repo + identifier + +According "SPECIFIC FILE DESCRIPTIONS" in `man portage`, it is valid to +have a parent path like `:path/to/profile` where the repo identifier is +missing. This refers to a path in the current repo. + +Signed-off-by: James Le Cuirot +--- + src/pkgcore/ebuild/profiles.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/pkgcore/ebuild/profiles.py b/src/pkgcore/ebuild/profiles.py +index 384e41e22..fea1eacc7 100644 +--- a/src/pkgcore/ebuild/profiles.py ++++ b/src/pkgcore/ebuild/profiles.py +@@ -254,6 +254,8 @@ def parent_paths(self, data): + f"unknown repo {repo_id!r}" + ) + continue ++ else: ++ location = repo_config.location + l.append( + ( + abspath(pjoin(location, "profiles", profile_path)), diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/sys-apps/pkgcore/README.md b/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/sys-apps/pkgcore/README.md new file mode 100644 index 0000000000..c61330e6b2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/sys-apps/pkgcore/README.md @@ -0,0 +1,2 @@ +The `0001-build-profiles-patch.patch` patch can be dropped when we +update sys-apps/pkgcore to version greater than `0.12.27`.