Use DefaultWorkspaceDir from container instead of hardcoding /home/build #1728
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
…uild" Signed-off-by: dann frazier <[email protected]>
Signed-off-by: dann frazier <[email protected]>
dannf
added a commit
to wolfi-dev/os
that referenced
this pull request
Jan 3, 2025
This package requires lazy binding to build, which conflicts with
the `-Wl,-z,now` flag in openssf-compiler-options. Instead of disabling
all of the openssf options, let's just drop that one flag.
I tried to implement this completely within openssf-compiler-options,
as described here[*], but the %{!Wl,-z,now:...} syntax doesn't seem
to work for detecting these options. I also tried including various
spec file snippets to tweak the *link_command and friends, but failed.
For now, let's just make our own copy of openssf.spec and edit/use it.
Note: spec files need to have fully qualified paths. melange doesn't
support ${{package.srcdir}} expansion in environment variables yet[**],
so I've hardcoded `/home/build` for now.
[*] #34568 (comment)
[**] chainguard-dev/melange#1728
Signed-off-by: dann frazier <[email protected]>
dannf
added a commit
to wolfi-dev/os
that referenced
this pull request
Jan 3, 2025
This package requires lazy binding to build, which conflicts with
the `-Wl,-z,now` flag in openssf-compiler-options. Instead of disabling
all of the openssf options, let's just drop that one flag.
I tried to implement this completely within openssf-compiler-options,
as described here[*], but the %{!Wl,-z,now:...} syntax doesn't seem
to work for detecting these options. I also tried including various
spec file snippets to tweak the *link_command and friends, but failed.
For now, let's just make our own copy of openssf.spec and edit/use it.
Note: spec files need to have fully qualified paths. melange doesn't
support ${{package.srcdir}} expansion in environment variables yet[**],
so I've hardcoded `/home/build` for now.
[*] #34568 (comment)
[**] chainguard-dev/melange#1728
Signed-off-by: dann frazier <[email protected]>
dannf
added a commit
to wolfi-dev/os
that referenced
this pull request
Jan 3, 2025
…lazy binding
This package requires lazy binding to build, which conflicts with
the `-Wl,-z,now` flag in openssf-compiler-options. Instead of disabling
all of the openssf options, let's just drop that one flag.
I tried to implement this completely within openssf-compiler-options,
as described here[*], but the %{!Wl,-z,now:...} syntax doesn't seem
to work for detecting these options. I also tried including various
spec file snippets to tweak the *link_command and friends, but failed.
For now, let's just make our own copy of openssf.spec and edit/use it.
Note: spec files need to have fully qualified paths. melange doesn't
support ${{package.srcdir}} expansion in environment variables yet[**],
so I've hardcoded `/home/build` for now.
[*] #34568 (comment)
[**] chainguard-dev/melange#1728
Signed-off-by: dann frazier <[email protected]>
dannf
added a commit
to dannf/os
that referenced
this pull request
Jan 15, 2025
…w lazy binding
This package requires lazy binding to build, which conflicts with
the `-Wl,-z,now` flag in openssf-compiler-options. Instead of disabling
all of the openssf options, let's just drop that one flag.
I tried to implement this completely within openssf-compiler-options,
as described here[*], but the %{!Wl,-z,now:...} syntax doesn't seem
to work for detecting these options. I also tried including various
spec file snippets to tweak the *link_command and friends, but failed.
For now, let's just make our own copy of openssf.spec and edit/use it.
Note: spec files need to have fully qualified paths. melange doesn't
support ${{package.srcdir}} expansion in environment variables yet[**],
so I've hardcoded `/home/build` for now.
[*] wolfi-dev#34568 (comment)
[**] chainguard-dev/melange#1728
Signed-off-by: dann frazier <[email protected]>
dannf
added a commit
to dannf/os
that referenced
this pull request
Jan 15, 2025
…lazy binding
This package requires lazy binding to build, which conflicts with
the `-Wl,-z,now` flag in openssf-compiler-options. Instead of disabling
all of the openssf options, let's just drop that one flag.
I tried to implement this completely within openssf-compiler-options,
as described here[*], but the %{!Wl,-z,now:...} syntax doesn't seem
to work for detecting these options. I also tried including various
spec file snippets to tweak the *link_command and friends, but failed.
For now, let's just make our own copy of openssf.spec and edit/use it.
Note: spec files need to have fully qualified paths. melange doesn't
support ${{package.srcdir}} expansion in environment variables yet[**],
so I've hardcoded `/home/build` for now.
[*] wolfi-dev#34568 (comment)
[**] chainguard-dev/melange#1728
Signed-off-by: dann frazier <[email protected]>
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.
We have
/home/buildhardcoded in several places. It seems likecontainer.DefaultWorkspaceDiris the canonical definition, so let's just use it. Also use it to do${{package.srcdir}}substitutions (which is what I'm really after here).Note: This is my first time touching
melangecode. There may be a very good reason we aren't importingcontainerhere - but it isn't clear to me.