From a0208a706a169a6f088900b389a4cdd4244adb80 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Mon, 20 Feb 2023 17:07:06 +0100
Subject: [PATCH] build_library/dev_container_util.sh: Fix setting up portage

With PORTDIR and PORTDIR_OVERLAY environment variables being gone as
overrides, setting up a profile for the developer container broke. The
overrides were a hack already, as eselect does not seem to have
support for setting a profile based on repos.conf with repo locations
that are valid only after chrooting into the root directory. So
instead of invoking eselect, we set up the symlink ourselves.
---
 build_library/dev_container_util.sh | 33 ++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/build_library/dev_container_util.sh b/build_library/dev_container_util.sh
index e2d89885db..a9e834bb3a 100755
--- a/build_library/dev_container_util.sh
+++ b/build_library/dev_container_util.sh
@@ -14,18 +14,22 @@ get_binhost_url() {
 }
 
 configure_dev_portage() {
+    local root_fs_dir="${1}"; shift
+    local binhost="${1}"; shift
+    local update_group="${1}"; shift
+
     # Need profiles at the bare minimum
     local repo
     for repo in portage-stable coreos-overlay; do
-        sudo mkdir -p "$1/var/lib/portage/${repo}"
+        sudo mkdir -p "${root_fs_dir}/var/lib/portage/${repo}"
         sudo rsync -rtl --exclude=md5-cache \
             "${SRC_ROOT}/third_party/${repo}/metadata" \
             "${SRC_ROOT}/third_party/${repo}/profiles" \
-            "$1/var/lib/portage/${repo}"
+            "${root_fs_dir}/var/lib/portage/${repo}"
     done
 
-    sudo mkdir -p "$1/etc/portage/repos.conf"
-    sudo_clobber "$1/etc/portage/make.conf" <<EOF
+    sudo mkdir -p "${root_fs_dir}/etc/portage/repos.conf"
+    sudo_clobber "${root_fs_dir}/etc/portage/make.conf" <<EOF
 # make.conf for Flatcar dev images
 ARCH=$(get_board_arch $BOARD)
 CHOST=$(get_board_chost $BOARD)
@@ -34,11 +38,11 @@ CHOST=$(get_board_chost $BOARD)
 DISTDIR="/var/lib/portage/distfiles"
 PKGDIR="/var/lib/portage/pkgs"
 PORT_LOGDIR="/var/log/portage"
-PORTAGE_BINHOST="$(get_binhost_url "$2" "$3" 'pkgs')
-$(get_binhost_url "$2" "$3" 'toolchain')"
+PORTAGE_BINHOST="$(get_binhost_url "${binhost}" "${update_group}" 'pkgs')
+$(get_binhost_url "${binhost}" "${update_group}" 'toolchain')"
 EOF
 
-sudo_clobber "$1/etc/portage/repos.conf/coreos.conf" <<EOF
+    sudo_clobber "${root_fs_dir}/etc/portage/repos.conf/coreos.conf" <<EOF
 [DEFAULT]
 main-repo = portage-stable
 
@@ -53,9 +57,18 @@ sync-type = git
 sync-uri = https://github.com/flatcar/portage-stable.git
 EOF
 
-    # Now set the correct profile
-    sudo PORTAGE_CONFIGROOT="$1" ROOT="$1" \
-        eselect profile set --force $(get_board_profile $BOARD)/dev
+    # Now set the correct profile, we do not use the eselect tool - it
+    # does not seem to be usable outside of the chroot without using
+    # deprecated PORTDIR and PORTDIR_OVERLAY environment variables.
+    local profile_name=$(get_board_profile "${BOARD}")
+    # Turn coreos:coreos/amd64/generic into coreos/amd64/generic/dev
+    profile_name="${profile_name#*:}/dev"
+    local profile_directory="${root_fs_dir}/var/lib/portage/coreos-overlay/profiles/${profile_name}"
+    if [[ ! -d "${profile_directory}" ]]; then
+        die "Not a valid profile: ${profile_name}"
+    fi
+    local profile_link="${root_fs_dir}/etc/portage/make.profile"
+    sudo ln -sfrT "${profile_directory}" "${profile_link}"
 }
 
 create_dev_container() {