update patches loading to support v6.1.0 and cpu-max #58
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
tonistiigi
force-pushed
the
update-v6.1-patches
branch
from
d4030b8 to
0b1a9e9
Compare
tonistiigi
commented
Aug 26, 2021
Dockerfile
Outdated
| if [ "$(printf "$(cat qemu/VERSION)\n6.0.90" | sort -V | head -n 1)" = "6.0.90" ]; then | ||
| # this issue has been fixed upstream by using non-glibc specific macro | ||
| rm -rf patches/alpine-patches/fix-sigevent-and-sigval_t.patch || true | ||
| # following patches are already applied upstream |
There was a problem hiding this comment.
I'm not quite sure why these didn't cause issues in https://github.com/tonistiigi/binfmt/runs/3416730404
tonistiigi
force-pushed
the
update-v6.1-patches
branch
from
0b1a9e9 to
fb32164
Compare
Signed-off-by: Tonis Tiigi <[email protected]>
tonistiigi
force-pushed
the
update-v6.1-patches
branch
3 times, most recently
from
0765a23 to
d0dd3d0
Compare
|
Alpine updated their patches to v6.1 and I made our selection to match theirs with version based ranges(+additional out patches). If needed the |
tonistiigi
force-pushed
the
update-v6.1-patches
branch
2 times, most recently
from
2e19b6b to
624d941
Compare
crazy-max
force-pushed
the
update-v6.1-patches
branch
6 times, most recently
from
c0f1741 to
624d941
Compare
Signed-off-by: Tonis Tiigi <[email protected]>
Signed-off-by: Tonis Tiigi <[email protected]>
tonistiigi
force-pushed
the
update-v6.1-patches
branch
from
624d941 to
39ec624
Compare
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.
closes #59
Modifies patches loading to
The alpine/musl patches situation isn't very stable. Current works with v6.0 and v6.1 . Doesn't work with 5.x and may break when alpine/musl updates. I think we might need a "config file" with specific sports commit for specific version ranges or version-based patch loading from local files. If we copy patches from aports to this repo we also need to add exceptions for them to license as I don't know where they are coming from and they could be gpl. We can work on this as follow-up.
@crazy-max
Signed-off-by: Tonis Tiigi [email protected]