[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     a5f2ab7ee65aed6f4b48fab10cd9fc9e86f059ba
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  2 08:14:51 2025 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Dec  2 08:14:51 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a5f2ab7e

scripts/bootstrap-prefix: ensure gtar is available to portage

phase-helpers.sh now assumes gtar instead of tar, so let's provide it

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 125695a587..f89da4891c 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -688,8 +688,12 @@ bootstrap_portage() {
        # As such, portage complains..
        mkdir -p "${ROOT}"/tmp/var/log
 
-       # in Prefix the sed wrapper is deadly, so kill it
-       rm -f "${ROOT}"/tmp/usr/lib/portage/bin/ebuild-helpers/sed
+       # phase-helpers.sh now uses gtar instead of tar, so ensure we have
+       # it available
+       if [[ -x "${ROOT}"/tmp/bin/tar ]] ; then
+               rm -f "${ROOT}"/tmp/bin/gtar
+               ( cd "${ROOT}"/tmp/bin ; ln -s tar gtar )
+       fi
 
        local tmpportdir=${ROOT}/tmp/${PORTDIR#"${ROOT}"}
        [[ -e "${tmpportdir}" ]] || ln -s "${PORTDIR}" "${tmpportdir}"