From 57f849239f9121c719d14d47e03e5f8ebdca7989 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Thu, 26 Jan 2023 08:47:20 +0100
Subject: [PATCH] build_library/toolchain_util: Set up symlink for user patches

This was a place I missed where /etc/portage is set up. Because of it,
user patches for sys-devel/gcc were not picked up.

Also stop using deprecated PORTDIR and PORTDIR_OVERLAY getters. We
still set those variables, but we will drop them eventually.
---
 build_library/toolchain_util.sh | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/build_library/toolchain_util.sh b/build_library/toolchain_util.sh
index d832cca7c6..87f701a9c2 100644
--- a/build_library/toolchain_util.sh
+++ b/build_library/toolchain_util.sh
@@ -284,9 +284,16 @@ _configure_sysroot() {
     $sudo cp /etc/portage/repos.conf/* "${ROOT}/etc/portage/repos.conf/"
     $sudo eselect profile set --force "$profile"
 
-    $sudo tee "${ROOT}/etc/portage/make.conf" >/dev/null <<EOF
-$(portageq envvar -v CHOST CBUILD ROOT \
-    PORTDIR PORTDIR_OVERLAY DISTDIR PKGDIR)
+    local coreos_path
+    coreos_path=$(portageq get_repo_path "${ROOT}" coreos)
+    $sudo ln -sfT "${coreos_path}/coreos/user-patches" "${ROOT}/etc/portage/patches"
+
+    echo "Writing make.conf for the sysroot ${SYSROOT}, root ${ROOT}"
+    $sudo tee "${ROOT}/etc/portage/make.conf" <<EOF
+$(portageq envvar -v CHOST CBUILD ROOT DISTDIR PKGDIR)
+# TODO: These are deprecated, drop them eventually.
+PORTDIR="$(portageq get_repo_path "${ROOT}" portage-stable)"
+PORTDIR_OVERLAY="${coreos_path} $(portageq get_repo_path "${ROOT}" x-crossdev)"
 HOSTCC=\${CBUILD}-gcc
 PKG_CONFIG_PATH="\${SYSROOT}/usr/lib/pkgconfig/"
 # Enable provenance reporting by default. Produced files are in /usr/share/SLSA