mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-21 13:41:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

*: Drop the use of deprecated PORTDIR and PORTDIR_OVERLAY env vars

Browse Source 
These were mostly replaced by relevant config in repos.conf directory.
This commit is contained in:
Krzesimir Nowak 2022-01-18 18:36:20 +01:00
parent 809401262f
commit a76292c7d5
4 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build_library/dev_container_util.sh
View File

@ -34,8 +34,6 @@ CHOST=$(get_board_chost $BOARD)
DISTDIR="/var/lib/portage/distfiles" DISTDIR="/var/lib/portage/distfiles"
PKGDIR="/var/lib/portage/pkgs" PKGDIR="/var/lib/portage/pkgs"
PORT_LOGDIR="/var/log/portage" 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') PORTAGE_BINHOST="$(get_binhost_url "$2" "$3" 'pkgs')
$(get_binhost_url "$2" "$3" 'toolchain')" $(get_binhost_url "$2" "$3" 'toolchain')"
EOF EOF
@ -57,8 +55,6 @@ EOF
# Now set the correct profile # Now set the correct profile
sudo PORTAGE_CONFIGROOT="$1" ROOT="$1" \ 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 eselect profile set --force $(get_board_profile $BOARD)/dev
} }

3
build_library/toolchain_util.sh
View File

@ -291,9 +291,6 @@ _configure_sysroot() {
echo "Writing make.conf for the sysroot ${SYSROOT}, root ${ROOT}" echo "Writing make.conf for the sysroot ${SYSROOT}, root ${ROOT}"
"${sudo[@]}" tee "${ROOT}/etc/portage/make.conf" <<EOF "${sudo[@]}" tee "${ROOT}/etc/portage/make.conf" <<EOF
$(portageq envvar -v CHOST CBUILD ROOT DISTDIR PKGDIR) $(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 HOSTCC=\${CBUILD}-gcc
PKG_CONFIG_PATH="\${SYSROOT}/usr/lib/pkgconfig/" PKG_CONFIG_PATH="\${SYSROOT}/usr/lib/pkgconfig/"
# Enable provenance reporting by default. Produced files are in /usr/share/SLSA # Enable provenance reporting by default. Produced files are in /usr/share/SLSA

2
setup_board
View File

@ -253,8 +253,6 @@ sudo_clobber "${BOARD_ETC}/portage/make.conf" <<EOF
# Settings derived from the host environment # Settings derived from the host environment
CBUILD="$(portageq envvar CHOST)" CBUILD="$(portageq envvar CHOST)"
HOSTCC="$(portageq envvar CHOST)-gcc" HOSTCC="$(portageq envvar CHOST)-gcc"
PORTDIR="$(portageq envvar PORTDIR)"
PORTDIR_OVERLAY="$(portageq envvar PORTDIR_OVERLAY)"
DISTDIR="$(portageq envvar DISTDIR)" DISTDIR="$(portageq envvar DISTDIR)"
MAKEOPTS="$(portageq envvar MAKEOPTS)" MAKEOPTS="$(portageq envvar MAKEOPTS)"
PORTAGE_USERNAME="$(portageq envvar PORTAGE_USERNAME)" PORTAGE_USERNAME="$(portageq envvar PORTAGE_USERNAME)"

2
update_chroot
View File

@ -88,8 +88,6 @@ sudo touch /etc/portage/make.conf.user
sudo_clobber "/etc/portage/make.conf" <<EOF sudo_clobber "/etc/portage/make.conf" <<EOF
# Created by update_chroot # Created by update_chroot
PORTDIR="${PORTAGE_STABLE_OVERLAY}"
PORTDIR_OVERLAY="${CROSSDEV_OVERLAY} ${COREOS_OVERLAY}"
DISTDIR="${REPO_CACHE_DIR}/distfiles" DISTDIR="${REPO_CACHE_DIR}/distfiles"
PKGDIR="/var/lib/portage/pkgs" PKGDIR="/var/lib/portage/pkgs"
PORT_LOGDIR="/var/log/portage" PORT_LOGDIR="/var/log/portage"