From a76292c7d50f652b105cf8cf1450ff30a0e36deb Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Tue, 18 Jan 2022 18:36:20 +0100
Subject: [PATCH] *: Drop the use of deprecated PORTDIR and PORTDIR_OVERLAY env
 vars

These were mostly replaced by relevant config in repos.conf directory.
---
 build_library/dev_container_util.sh | 4 ----
 build_library/toolchain_util.sh     | 3 ---
 setup_board                         | 2 --
 update_chroot                       | 2 --
 4 files changed, 11 deletions(-)

diff --git a/build_library/dev_container_util.sh b/build_library/dev_container_util.sh
index 8710b304fd..e2d89885db 100755
--- a/build_library/dev_container_util.sh
+++ b/build_library/dev_container_util.sh
@@ -34,8 +34,6 @@ CHOST=$(get_board_chost $BOARD)
 DISTDIR="/var/lib/portage/distfiles"
 PKGDIR="/var/lib/portage/pkgs"
 PORT_LOGDIR="/var/log/portage"
-PORTDIR="/var/lib/portage/portage-stable"
-PORTDIR_OVERLAY="/var/lib/portage/coreos-overlay"
 PORTAGE_BINHOST="$(get_binhost_url "$2" "$3" 'pkgs')
 $(get_binhost_url "$2" "$3" 'toolchain')"
 EOF
@@ -57,8 +55,6 @@ EOF
 
     # Now set the correct profile
     sudo PORTAGE_CONFIGROOT="$1" ROOT="$1" \
-        PORTDIR="$1/var/lib/portage/portage-stable" \
-        PORTDIR_OVERLAY="$1/var/lib/portage/coreos-overlay" \
         eselect profile set --force $(get_board_profile $BOARD)/dev
 }
 
diff --git a/build_library/toolchain_util.sh b/build_library/toolchain_util.sh
index eccbecba9e..8ed67eb630 100644
--- a/build_library/toolchain_util.sh
+++ b/build_library/toolchain_util.sh
@@ -291,9 +291,6 @@ _configure_sysroot() {
     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
diff --git a/setup_board b/setup_board
index 68473a3973..dd9a006386 100755
--- a/setup_board
+++ b/setup_board
@@ -253,8 +253,6 @@ sudo_clobber "${BOARD_ETC}/portage/make.conf" <<EOF
 # Settings derived from the host environment
 CBUILD="$(portageq envvar CHOST)"
 HOSTCC="$(portageq envvar CHOST)-gcc"
-PORTDIR="$(portageq envvar PORTDIR)"
-PORTDIR_OVERLAY="$(portageq envvar PORTDIR_OVERLAY)"
 DISTDIR="$(portageq envvar DISTDIR)"
 MAKEOPTS="$(portageq envvar MAKEOPTS)"
 PORTAGE_USERNAME="$(portageq envvar PORTAGE_USERNAME)"
diff --git a/update_chroot b/update_chroot
index f4d303e267..a36438ee9f 100755
--- a/update_chroot
+++ b/update_chroot
@@ -88,8 +88,6 @@ sudo touch /etc/portage/make.conf.user
 
 sudo_clobber "/etc/portage/make.conf" <<EOF
 # Created by update_chroot
-PORTDIR="${PORTAGE_STABLE_OVERLAY}"
-PORTDIR_OVERLAY="${CROSSDEV_OVERLAY} ${COREOS_OVERLAY}"
 DISTDIR="${REPO_CACHE_DIR}/distfiles"
 PKGDIR="/var/lib/portage/pkgs"
 PORT_LOGDIR="/var/log/portage"