Merged
Conversation
Changes: - docker-library/busybox@1cf2cba: Merge pull request docker-library/busybox#82 from infosiftr/buildroot-2020.02.2 - docker-library/busybox@aa2414e: Update Buildroot to 2020.02.2 - docker-library/busybox@363154b: Update README stub - docker-library/busybox@8454c26: Merge pull request docker-library/busybox#81 from infosiftr/github-actions - docker-library/busybox@eb35037: Update GitHub Actions to take advantage of a generated matrix
Diff for ecbd448:diff --git a/_bashbrew-cat b/_bashbrew-cat
index e6eed35..a9c2af5 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,23 +1,23 @@
Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon), Joseph Ferguson <yosifkit@gmail.com> (@yosifkit), Jérôme Petazzoni <jerome.petazzoni@gmail.com> (@jpetazzo)
GitRepo: https://github.com/docker-library/busybox.git
-GitCommit: 68c99dc583c8755e7dce77acdd356bfde00046b6
-amd64-GitCommit: 08d3f7114ee5ac055c0fedad0a930e67c5f8b6f4
+GitCommit: 1cf2cba27e47cac63b2b705d6d237d0e84b07b31
+amd64-GitCommit: 7c3206169c4d32ae0afbb36b90cb9f9b77011f7a
amd64-GitFetch: refs/heads/dist-amd64
-arm32v5-GitCommit: 6219d5edb1d20afa0b80e29ab7a69165d1f90b75
+arm32v5-GitCommit: 442b9471a07fe059fdce27fc4f8caef1be19e73f
arm32v5-GitFetch: refs/heads/dist-arm32v5
-arm32v6-GitCommit: 49e7aa905bfadddbad90002925f4ce8872215fbc
+arm32v6-GitCommit: aef519f3e26970dd1278cddfadc1bc42d34a75b1
arm32v6-GitFetch: refs/heads/dist-arm32v6
-arm32v7-GitCommit: 8cc6110cfc031f859fe3f251a5f742bec8e9af3f
+arm32v7-GitCommit: c695e0ffd7df9df64869ee77dcfb571464fce183
arm32v7-GitFetch: refs/heads/dist-arm32v7
-arm64v8-GitCommit: 2fa8a48dd97c90c0da68c00fd60a104242a25b88
+arm64v8-GitCommit: 80cf7031e73b261c7a9204e8b221b22a7f85f8a1
arm64v8-GitFetch: refs/heads/dist-arm64v8
-i386-GitCommit: 1e9e91d4ccf98236a6a86b7eae6d0a5e6dd4cb29
+i386-GitCommit: 4a983e50400610588620dc5a0e9606942f2c852f
i386-GitFetch: refs/heads/dist-i386
-mips64le-GitCommit: 6ed838e3538d927d93e3d312305c14790f3b13b4
+mips64le-GitCommit: 5df054ae2279437bd95320c19344a9b9d9b5f435
mips64le-GitFetch: refs/heads/dist-mips64le
-ppc64le-GitCommit: dbdb1569a13fd471906468518bc877828abcb25d
+ppc64le-GitCommit: 44486923d5dd699f25fd25d1c36ea1225e5de492
ppc64le-GitFetch: refs/heads/dist-ppc64le
-s390x-GitCommit: e33236a4281c705ecf4dfdd0606277c7cfa4bd72
+s390x-GitCommit: 284ef4842056051a8f16ad810b666f07a9490090
s390x-GitFetch: refs/heads/dist-s390x
Tags: 1.31.1, 1.31, 1, latest
diff --git a/busybox_glibc/Dockerfile.builder b/busybox_glibc/Dockerfile.builder
index b06ac2a..2958af6 100644
--- a/busybox_glibc/Dockerfile.builder
+++ b/busybox_glibc/Dockerfile.builder
@@ -121,7 +121,7 @@ RUN set -eux; \
# download a few extra files from buildroot (/etc/passwd, etc)
RUN set -eux; \
- buildrootVersion='2020.02.1'; \
+ buildrootVersion='2020.02.2'; \
mkdir -p rootfs/etc; \
for f in passwd shadow group; do \
curl -fL -o "rootfs/etc/$f" "https://git.busybox.net/buildroot/plain/system/skeleton/etc/$f?id=$buildrootVersion"; \
diff --git a/busybox_glibc/busybox.tar.xz b/busybox_glibc/busybox.tar.xz
index 36df55e..0cd7254 100644
Binary files a/busybox_glibc/busybox.tar.xz and b/busybox_glibc/busybox.tar.xz differ
diff --git a/busybox_latest/Dockerfile.builder b/busybox_latest/Dockerfile.builder
index 41e98ce..fca6433 100644
--- a/busybox_latest/Dockerfile.builder
+++ b/busybox_latest/Dockerfile.builder
@@ -33,7 +33,7 @@ RUN gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys AB07D806D2CE7
# https://buildroot.org/download.html
# https://buildroot.org/downloads/?C=M;O=D
-ENV BUILDROOT_VERSION 2020.02.1
+ENV BUILDROOT_VERSION 2020.02.2
RUN set -eux; \
tarball="buildroot-${BUILDROOT_VERSION}.tar.bz2"; \
@@ -113,6 +113,17 @@ RUN set -eux; \
"; \
;; \
\
+ mips64el) \
+ setConfs="$setConfs \
+ BR2_mips64el=y \
+ BR2_mips_64r2=y \
+ BR2_MIPS_NABI64=y \
+ "; \
+ unsetConfs="$unsetConfs \
+ BR2_MIPS_SOFT_FLOAT \
+ " \
+ ;; \
+ \
# TODO ppc64el ? (needs BR2_TOOLCHAIN_BUILDROOT_UCLIBC support)
\
# TODO s390x ? (needs BR2_TOOLCHAIN_BUILDROOT_UCLIBC support)
diff --git a/busybox_latest/busybox.tar.xz b/busybox_latest/busybox.tar.xz
index 1c3f660..3c9ea6b 100644
Binary files a/busybox_latest/busybox.tar.xz and b/busybox_latest/busybox.tar.xz differ
diff --git a/busybox_musl/Dockerfile.builder b/busybox_musl/Dockerfile.builder
index cf7cc1c..0c3bd50 100644
--- a/busybox_musl/Dockerfile.builder
+++ b/busybox_musl/Dockerfile.builder
@@ -105,7 +105,7 @@ RUN set -eux; \
# download a few extra files from buildroot (/etc/passwd, etc)
RUN set -eux; \
- buildrootVersion='2020.02.1'; \
+ buildrootVersion='2020.02.2'; \
mkdir -p rootfs/etc; \
for f in passwd shadow group; do \
curl -fL -o "rootfs/etc/$f" "https://git.busybox.net/buildroot/plain/system/skeleton/etc/$f?id=$buildrootVersion"; \
diff --git a/busybox_musl/busybox.tar.xz b/busybox_musl/busybox.tar.xz
index ae55e6e..3e71c74 100644
Binary files a/busybox_musl/busybox.tar.xz and b/busybox_musl/busybox.tar.xz differ
diff --git a/busybox_uclibc/Dockerfile.builder b/busybox_uclibc/Dockerfile.builder
index 41e98ce..fca6433 100644
--- a/busybox_uclibc/Dockerfile.builder
+++ b/busybox_uclibc/Dockerfile.builder
@@ -33,7 +33,7 @@ RUN gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys AB07D806D2CE7
# https://buildroot.org/download.html
# https://buildroot.org/downloads/?C=M;O=D
-ENV BUILDROOT_VERSION 2020.02.1
+ENV BUILDROOT_VERSION 2020.02.2
RUN set -eux; \
tarball="buildroot-${BUILDROOT_VERSION}.tar.bz2"; \
@@ -113,6 +113,17 @@ RUN set -eux; \
"; \
;; \
\
+ mips64el) \
+ setConfs="$setConfs \
+ BR2_mips64el=y \
+ BR2_mips_64r2=y \
+ BR2_MIPS_NABI64=y \
+ "; \
+ unsetConfs="$unsetConfs \
+ BR2_MIPS_SOFT_FLOAT \
+ " \
+ ;; \
+ \
# TODO ppc64el ? (needs BR2_TOOLCHAIN_BUILDROOT_UCLIBC support)
\
# TODO s390x ? (needs BR2_TOOLCHAIN_BUILDROOT_UCLIBC support)
diff --git a/busybox_uclibc/busybox.tar.xz b/busybox_uclibc/busybox.tar.xz
index 1c3f660..3c9ea6b 100644
Binary files a/busybox_uclibc/busybox.tar.xz and b/busybox_uclibc/busybox.tar.xz differ |
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.
Changes: