src/pkg/bb: Resolve conflicting u-root#72
Merged
walterchris merged 1 commit intomainfrom Jun 11, 2022
Merged
Conversation
Contributor
Author
|
This is just meant to start the discussion. |
walterchris
force-pushed
the
fixup/conflictinguroot
branch
3 times, most recently
from
addd5c2 to
2e0f962
Compare
walterchris
added
enhancement
walterchris
force-pushed
the
fixup/conflictinguroot
branch
2 times, most recently
from
08a17af to
d3fd441
Compare
|
Code looks good so far, we should add some info about the change in behavior into the README before merging this. |
if any third-party cmd we pull in to build uses u-root as a dependency, it will always conflict. When building u-root, u-root is always pulled in as a local dependency i.e. github.com/u-root/u-root@directory. This conflicts with every go.mod that is outside of u-root/u-root and depends on u-root. Signed-off-by: Christian Walter <christian.walter@9elements.com>
walterchris
force-pushed
the
fixup/conflictinguroot
branch
from
d3fd441 to
4e83bb4
Compare
rminnich
approved these changes
Jun 11, 2022
Member
rminnich
left a comment
rminnich
left a comment
There was a problem hiding this comment.
I hope this is ok to go in, it fixes a major usage problem for me in u-root: not being able to build an image which has both cpud and u-root programs.
MDr164
approved these changes
Jun 11, 2022
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
if any third-party cmd we pull in to build uses u-root as a dependency,
it will always conflict. When building u-root, u-root is always pulled
in as a local dependency i.e. github.com/u-root/u-root@directory. This
conflicts with every go.mod that is outside of u-root/u-root and depends
on u-root.
Signed-off-by: Christian Walter christian.walter@9elements.com