commit: 2e9559cdefb6159bd3185b9960f95c8567fe3752
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 4 07:22:11 2025 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Dec 4 07:22:11 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2e9559cd
scripts/bootstrap-prefix: push user/pass/uid/gid via bootstrap config
Like RAP, push out the values for the user to run as during bootstrap.
non-RAP Prefix should migrate to this setup to make things simpler.
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/bootstrap-prefix.sh | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index fe70d89192..7fb9f79171 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -314,16 +314,16 @@ bootstrap_setup() {
echo 'ACCEPT_KEYWORDS="~ppc-macos"'
fi
- if is-rap ; then
- # https://bugs.gentoo.org/933100
- # mainline Portage doesn't set these like
Prefix branch
- # does, so hardwire the IDs here
- echo
- echo "PORTAGE_USERNAME=$(id --name --user)"
- echo "PORTAGE_GRPNAME=$(id --name --group)"
- echo "PORTAGE_INST_UID=$(id --user)"
- echo "PORTAGE_INST_GID=$(id --group)"
- fi
+ # https://bugs.gentoo.org/933100
+ # Prefix Portage branch sets this in make.globals,
mainline
+ # does not, which breaks RAP. Unconditionally set the
vars
+ # here, as it makes more sense, while we figure out a
way to
+ # migrate Prefix to not pushing this in make.globals.
+ echo
+ echo "PORTAGE_USERNAME=$(id --name --user)"
+ echo "PORTAGE_GRPNAME=$(id --name --group)"
+ echo "PORTAGE_INST_UID=$(id --user)"
+ echo "PORTAGE_INST_GID=$(id --group)"
} > "${MAKE_CONF_DIR}/0100_bootstrap_prefix_make.conf"
fi
