Do not export PMS variables in EAPI 9 #1407
Open
+128
−3
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Flowdalic
force-pushed
the
pass-env-via-file-dont-export-pms-vars
branch
from
13610de to
6753aea
Compare
Flowdalic
changed the title
Flowdalic
force-pushed
the
pass-env-via-file-dont-export-pms-vars
branch
5 times, most recently
from
879a6fb to
67106ed
Compare
zmedico
reviewed
Dec 30, 2024
Flowdalic
force-pushed
the
pass-env-via-file-dont-export-pms-vars
branch
2 times, most recently
from
4ba182a to
a8e44e3
Compare
Flowdalic
commented
Dec 31, 2024
Flowdalic
force-pushed
the
pass-env-via-file-dont-export-pms-vars
branch
from
a8e44e3 to
834f78c
Compare
Flowdalic
added a commit
to Flowdalic/gentoo
that referenced
this pull request
Jan 1, 2025
Once a future EAPI does no longer export PMS variables (bug #721088 and [1]), we need to explicitly ensure that those are exported to helper commands which expect certain PMS variables in their process environment. While the portage ebuild is usually deliberately not using the latest EAPI, it may be a good idea to make it explicit that the _compat_upgrade helpers expect ED in their process environment. 1: gentoo/portage#1407 Signed-off-by: Florian Schmaus <[email protected]>
gentoo-bot
pushed a commit
to gentoo/gentoo
that referenced
this pull request
Jan 1, 2025
Once a future EAPI does no longer export PMS variables (bug #721088 and [1]), we need to explicitly ensure that those are exported to helper commands which expect certain PMS variables in their process environment. While the portage ebuild is usually deliberately not using the latest EAPI, it may be a good idea to make it explicit that the _compat_upgrade helpers expect ED in their process environment. 1: gentoo/portage#1407 Signed-off-by: Florian Schmaus <[email protected]> Closes: #39934 Signed-off-by: Sam James <[email protected]>
zmedico
approved these changes
Jan 2, 2025
zmedico
reviewed
Jan 5, 2025
Flowdalic
force-pushed
the
pass-env-via-file-dont-export-pms-vars
branch
2 times, most recently
from
bed117b to
7ef309a
Compare
zmedico
reviewed
Jan 7, 2025
Flowdalic
force-pushed
the
pass-env-via-file-dont-export-pms-vars
branch
5 times, most recently
from
5562b8e to
ba9955e
Compare
Flowdalic
commented
Jan 8, 2025
Flowdalic
force-pushed
the
pass-env-via-file-dont-export-pms-vars
branch
4 times, most recently
from
c3264d6 to
b4201dd
Compare
Flowdalic
force-pushed
the
pass-env-via-file-dont-export-pms-vars
branch
2 times, most recently
from
7e3bcb2 to
6e5e977
Compare
Instead of passing PMS variables as part of the process environment, we pass them via a file that is later sourced by the ebuild's bash. Since, for example, A is usually the greatest contributor to the process environment, removing it from the process environment significantly avoids running into MAX_ARG_STRLEN when spawning a new child process. This means that A and other PMS variables are no longer exported in the ebuild and hence unavaiable to child processes. However, A is mostly used as part of the default_src_unpack function and there A does not need to be exported. This started as a change that only unexported A, but was later extended to most PMS variables as suggested by ulm in https://bugs.gentoo.org/721088#c23. Thanks to Zac Medico for helpful input on this change, and to Eli Schwartz for suggesting that (bash) helpers should simply source the environment file introduced by this change. Closes: https://bugs.gentoo.org/721088 Signed-off-by: Florian Schmaus <[email protected]>
Flowdalic
force-pushed
the
pass-env-via-file-dont-export-pms-vars
branch
from
6e5e977 to
4f097cd
Compare
zmedico
reviewed
Jan 9, 2025
| # exists if we are processing a phase that is in | ||
| # _phase_func_map. But better safe than sorry. | ||
| if mysettings.get("EBUILD_PHASE") in _phase_func_map.keys() and os.path.isdir( | ||
| t |
There was a problem hiding this comment.
We could probably make this just mysettings.get("EBUILD_PHASE") != "depend".
zmedico
reviewed
Jan 9, 2025
| @@ -8,6 +8,15 @@ if ___eapi_has_version_functions; then | |||
| source "${PORTAGE_BIN_PATH}/eapi7-ver-funcs.sh" || exit 1 | |||
| fi | |||
|
|
|||
| if [[ -v PORTAGE_EBUILD_EXTRA_SOURCE ]]; then | |||
| source "${PORTAGE_EBUILD_EXTRA_SOURCE}" || exit 1 | |||
| # We delierbately do not unset PORTABE_EBUILD_EXTRA_SOURCE, so | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Instead of passing PMS variables as part of the process environment, we pass them via a file that is later sourced by the ebuild's bash.
Since, for example, A is usually the greatest contributor to the process environment, removing it from the process environment significantly avoids running into MAX_ARG_STRLEN when spawning a new child process.
This means that A and other PMS variables are no longer exported in the ebuild and hence unavaiable to child processes. However, A is mostly used as part of the default_src_unpack function and there A does not need to be exported.
This started as a change that only unexported A, but was later extended to most PMS variables as suggested by ulm in https://bugs.gentoo.org/721088#c23.
Thanks to Zac Medico for helpful input on this change.
Closes: https://bugs.gentoo.org/721088