Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

save-build-env: Strip out MAKEOPTS #1311

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Conversation

ismell
Copy link

@ismell ismell commented Mar 21, 2024

MAKEOPTS contains a host specific value. If the same package is built on a host with different core counts, the binpkgs will have different hashes. This change drops MAKEOPTS after src_install so that it's not included in final environment.gz.

Bug: https://bugs.gentoo.org/914441

I'm pulling this patch into chromiumos here: https://chromium-review.googlesource.com/c/chromiumos/bazel/+/5356724

Copy link
Member

@zmedico zmedico left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems reasonable. Thanks!

@thesamesam
Copy link
Member

I suppose this might help with https://bugs.gentoo.org/736794 too.

bin/save-ebuild-env.sh Outdated Show resolved Hide resolved
@ismell
Copy link
Author

ismell commented Apr 24, 2024

The change has been updated to also exclude NINJAOPTS, EPOCHREALTIME, EPOCHSECONDS, and SRANDOM.

Raul E Rangel added 2 commits April 24, 2024 13:16
MAKEOPTS and NINJAOPTS contains a host specific value. If the same
package is built on a host with different core counts, the binpkgs will
have different hashes. This change drops MAKEOPTS after src_install so
that it's not included in final environment.gz. This change also adds
them to the special_env_vars.py so that we always have the most up to
date version of these variables.

Bug: https://bugs.gentoo.org/914441
Bug: https://bugs.gentoo.org/736794
Signed-off-by: Raul E Rangel <[email protected]>
Bash provides access to the time and a random data via variables. We
don't want to persist these values when generating a binpkg.

Bug: https://bugs.gentoo.org/914441
Signed-off-by: Raul E Rangel <[email protected]>
@ismell
Copy link
Author

ismell commented Jun 21, 2024

Anything blocking this?

@zmedico zmedico requested a review from thesamesam June 21, 2024 22:41
Copy link
Member

@zmedico zmedico left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Anything blocking this?

I think it's fine. @sam what do you think?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants