Add explicit "patches" directory #207
Merged
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
This adds a directory for us to store patches we need to apply during build -- I've copied the "no CBQ" patch we've already been applying, and a new "sha1_process_block64_shaNI.patch" which applies a patch for our new non-x86 build failures. I've also added a README to the new patches directory to make it clear what types of patches are appropriate/acceptable (perhaps more accurately, why almost all patches are *not* acceptable). This changes the build context for our rootfs builds to be the root of the repository so we don't have to muddy our template applying code with which patches to copy and can instead maintain that in the template itself (and skip the entire "patch applying" block of code when there are no patches to apply).
tianon
commented
Sep 30, 2024
Comment on lines
+54
to
+55
| /.patches/no-cbq.patch \ | ||
| /.patches/sha1_process_block64_shaNI.patch \ |
There was a problem hiding this comment.
The explicit / prefix here is not my typical style, but was an intentional choice to try and make it more clear that these come from the root of the repository, not the directory of Dockerfile.builder -- thoughts on that justification are welcome!
There was a problem hiding this comment.
I don't have a better alternative, and it seems reasonable, so LGTM.
yosifkit
approved these changes
Oct 1, 2024
docker-library-bot
added a commit
to docker-library-bot/official-images
that referenced
this pull request
Oct 1, 2024
Changes: - docker-library/busybox@80253da: Merge pull request docker-library/busybox#207 from infosiftr/patches - docker-library/busybox@b1b77da: Merge pull request docker-library/busybox#208 from infosiftr/1.35-leftovers - docker-library/busybox@dc42a7a: Remove some 1.35.x leftovers - docker-library/busybox@6db9646: Add explicit "patches" directory - docker-library/busybox@3aa7243: Merge pull request docker-library/busybox#206 from infosiftr/1.37.0 - docker-library/busybox@f7c1280: Update metadata for amd64 - docker-library/busybox@349fb1c: Update to 1.37.0, buildroot 2024.08 - docker-library/busybox@baf678c: Update metadata for s390x - docker-library/busybox@39b9ca7: Update metadata for ppc64le - docker-library/busybox@dd52a09: Update metadata for mips64le - docker-library/busybox@a2ea348: Update metadata for i386 - docker-library/busybox@e70731d: Update metadata for arm64v8 - docker-library/busybox@a8a0a32: Update metadata for arm32v7 - docker-library/busybox@87d6fdf: Update metadata for arm32v6 - docker-library/busybox@f771196: Update metadata for arm32v5 - docker-library/busybox@bf65195: Merge pull request docker-library/busybox#205 from infosiftr/buildroot-2024.05.3 - docker-library/busybox@6b8f2c7: Update metadata for amd64
docker-library-bot
added a commit
to docker-library-bot/official-images
that referenced
this pull request
Oct 1, 2024
Changes: - docker-library/busybox@e41a239: Update metadata for s390x - docker-library/busybox@2ad4c4f: Update metadata for ppc64le - docker-library/busybox@e258905: Update metadata for mips64le - docker-library/busybox@d1f66b2: Update metadata for i386 - docker-library/busybox@13e1415: Update metadata for arm64v8 - docker-library/busybox@943b07b: Update metadata for arm32v7 - docker-library/busybox@eb8b9a1: Update metadata for arm32v6 - docker-library/busybox@fa016ca: Update metadata for arm32v5 - docker-library/busybox@80253da: Merge pull request docker-library/busybox#207 from infosiftr/patches - docker-library/busybox@b1b77da: Merge pull request docker-library/busybox#208 from infosiftr/1.35-leftovers - docker-library/busybox@dc42a7a: Remove some 1.35.x leftovers - docker-library/busybox@6db9646: Add explicit "patches" directory - docker-library/busybox@3aa7243: Merge pull request docker-library/busybox#206 from infosiftr/1.37.0 - docker-library/busybox@f7c1280: Update metadata for amd64 - docker-library/busybox@349fb1c: Update to 1.37.0, buildroot 2024.08 - docker-library/busybox@baf678c: Update metadata for s390x - docker-library/busybox@39b9ca7: Update metadata for ppc64le - docker-library/busybox@dd52a09: Update metadata for mips64le - docker-library/busybox@a2ea348: Update metadata for i386 - docker-library/busybox@e70731d: Update metadata for arm64v8 - docker-library/busybox@a8a0a32: Update metadata for arm32v7 - docker-library/busybox@87d6fdf: Update metadata for arm32v6 - docker-library/busybox@f771196: Update metadata for arm32v5 - docker-library/busybox@bf65195: Merge pull request docker-library/busybox#205 from infosiftr/buildroot-2024.05.3 - docker-library/busybox@6b8f2c7: Update metadata for amd64
tianon
pushed a commit
to docker-library-bot/official-images
that referenced
this pull request
Oct 1, 2024
Changes: - docker-library/busybox@e41a239: Update metadata for s390x - docker-library/busybox@2ad4c4f: Update metadata for ppc64le - docker-library/busybox@e258905: Update metadata for mips64le - docker-library/busybox@d1f66b2: Update metadata for i386 - docker-library/busybox@13e1415: Update metadata for arm64v8 - docker-library/busybox@943b07b: Update metadata for arm32v7 - docker-library/busybox@eb8b9a1: Update metadata for arm32v6 - docker-library/busybox@fa016ca: Update metadata for arm32v5 - docker-library/busybox@80253da: Merge pull request docker-library/busybox#207 from infosiftr/patches - docker-library/busybox@b1b77da: Merge pull request docker-library/busybox#208 from infosiftr/1.35-leftovers - docker-library/busybox@dc42a7a: Remove some 1.35.x leftovers - docker-library/busybox@6db9646: Add explicit "patches" directory - docker-library/busybox@3aa7243: Merge pull request docker-library/busybox#206 from infosiftr/1.37.0 - docker-library/busybox@f7c1280: Update metadata for amd64 - docker-library/busybox@349fb1c: Update to 1.37.0, buildroot 2024.08 - docker-library/busybox@baf678c: Update metadata for s390x - docker-library/busybox@39b9ca7: Update metadata for ppc64le - docker-library/busybox@dd52a09: Update metadata for mips64le - docker-library/busybox@a2ea348: Update metadata for i386 - docker-library/busybox@e70731d: Update metadata for arm64v8 - docker-library/busybox@a8a0a32: Update metadata for arm32v7 - docker-library/busybox@87d6fdf: Update metadata for arm32v6 - docker-library/busybox@f771196: Update metadata for arm32v5 - docker-library/busybox@bf65195: Merge pull request docker-library/busybox#205 from infosiftr/buildroot-2024.05.3 - docker-library/busybox@6b8f2c7: Update metadata for amd64
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.
This adds a directory for us to store patches we need to apply during build -- I've copied the "no CBQ" patch we've already been applying, and a new "sha1_process_block64_shaNI.patch" which applies a patch for our new non-x86 build failures (#206 (comment)).
I've also added a README to the new patches directory to make it clear what types of patches are appropriate/acceptable (perhaps more accurately, why almost all patches are not acceptable).
This changes the build context for our rootfs builds to be the root of the repository so we don't have to muddy our template applying code with which patches to copy and can instead maintain that in the template itself (and skip the entire "patch applying" block of code when there are no patches to apply).