Update buildroot to 2024.05.2

This also applies the "remove CBQ" patch across all variants consistently -- it's not technically needed on Alpine yet, but it will be, so it's simpler if we're just consistent.
docker-library · Aug 29, 2024 · 973b862 · 973b862
1 parent de921aa
commit 973b862
Show file tree

Hide file tree

Showing 44 changed files with 90 additions and 65 deletions.
diff --git a/Dockerfile-builder.template b/Dockerfile-builder.template
@@ -251,20 +251,15 @@ RUN set -eux; \
 
 WORKDIR /usr/src/busybox
 
-{{ if env.variant == "glibc" then ( -}}
 # https://github.com/docker-library/busybox/issues/198
 # https://bugs.busybox.net/show_bug.cgi?id=15931
 # https://bugs.debian.org/1071648
 RUN set -eux; \
-	. /etc/os-release; \
-	if [ "${ID:-}" = 'debian' ] && [ "${VERSION_CODENAME:-}" != 'bookworm' ]; then \
-		curl -fL -o busybox-no-cbq.patch 'https://bugs.busybox.net/attachment.cgi?id=9751'; \
-		echo '6671a12c48dbcefb653fc8403d1f103a1e2eba4a49b1ee9a9c27da8aa2db80d4 *busybox-no-cbq.patch' | sha256sum -c -; \
-		patch -p1 --input=busybox-no-cbq.patch; \
-		rm busybox-no-cbq.patch; \
-	fi
+	curl -fL -o busybox-no-cbq.patch 'https://bugs.busybox.net/attachment.cgi?id=9751'; \
+	echo '6671a12c48dbcefb653fc8403d1f103a1e2eba4a49b1ee9a9c27da8aa2db80d4 *busybox-no-cbq.patch' | sha256sum -c -; \
+	patch -p1 --input=busybox-no-cbq.patch; \
+	rm busybox-no-cbq.patch
 
-{{ ) else "" end -}}
 RUN set -eux; \
 	\
 # build date/time gets embedded in the BusyBox binary -- SOURCE_DATE_EPOCH should override that

diff --git a/latest-1/glibc/Dockerfile.builder b/latest-1/glibc/Dockerfile.builder
diff --git a/...da863e2e6015c9983c957cf1b068120aea609261d → ...1dae6352a1d079acb9e0c413d28ae3bb0a5a226b2 b/...da863e2e6015c9983c957cf1b068120aea609261d → ...1dae6352a1d079acb9e0c413d28ae3bb0a5a226b2
diff --git a/...fbdbbfdfe6eca9307d1787c2cd4391002a1fe3b76 → ...71eb68691c00b6af0c14a9988ad3fa3501d155499 b/...fbdbbfdfe6eca9307d1787c2cd4391002a1fe3b76 → ...71eb68691c00b6af0c14a9988ad3fa3501d155499
diff --git a/...841d16cfc5b9c724e71bc9556de6b5de833254428 → ...27dcf5344304f1da35fee7884969580eb10c2e61c b/...841d16cfc5b9c724e71bc9556de6b5de833254428 → ...27dcf5344304f1da35fee7884969580eb10c2e61c
diff --git a/latest-1/glibc/amd64/image-config.json b/latest-1/glibc/amd64/image-config.json
@@ -14,7 +14,7 @@
 	"rootfs": {
 		"type": "layers",
 		"diff_ids": [
-			"sha256:87f834448d48e9a743b0d5cb193d640d2269786bbfb01e79eb3eee34c9d9d961"
+			"sha256:7ace9a007a594ecb15f1e037f33d48e9709a4f34fdedb8a42fa47ed84c53d44f"
 		]
 	},
 	"architecture": "amd64",

diff --git a/latest-1/glibc/amd64/image-manifest.json b/latest-1/glibc/amd64/image-manifest.json
@@ -3,14 +3,14 @@
 	"mediaType": "application/vnd.oci.image.manifest.v1+json",
 	"config": {
 		"mediaType": "application/vnd.oci.image.config.v1+json",
-		"digest": "sha256:6b60752f5966a940adb07f4841d16cfc5b9c724e71bc9556de6b5de833254428",
+		"digest": "sha256:85df4271ae4007e67b41ad727dcf5344304f1da35fee7884969580eb10c2e61c",
 		"size": 372
 	},
 	"layers": [
 		{
 			"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
-			"digest": "sha256:bd816a2942336ab9a44b9f6fbdbbfdfe6eca9307d1787c2cd4391002a1fe3b76",
-			"size": 2149396
+			"digest": "sha256:8563b78c9f94f4fa19ce11171eb68691c00b6af0c14a9988ad3fa3501d155499",
+			"size": 2148775
 		}
 	],
 	"annotations": {

diff --git a/latest-1/glibc/amd64/index.json b/latest-1/glibc/amd64/index.json
@@ -4,7 +4,7 @@
 	"manifests": [
 		{
 			"mediaType": "application/vnd.oci.image.manifest.v1+json",
-			"digest": "sha256:5b6e7aeda43f426b6423f60da863e2e6015c9983c957cf1b068120aea609261d",
+			"digest": "sha256:48a34a0f9b4b6bd3db1a8ba1dae6352a1d079acb9e0c413d28ae3bb0a5a226b2",
 			"size": 610,
 			"platform": {
 				"architecture": "amd64",

diff --git a/latest-1/musl/Dockerfile.builder b/latest-1/musl/Dockerfile.builder
diff --git a/...439a045c00650eb998c51a88ed637b9b4bc569f89 → ...4fd2889eacc63859abb1588d132dd8c5b37b87dbd b/...439a045c00650eb998c51a88ed637b9b4bc569f89 → ...4fd2889eacc63859abb1588d132dd8c5b37b87dbd
diff --git a/...4c92784987012c6a44d6ddc18e7f7a4951d559c7e → ...24ea0076ff46b19abfab488d093a13a5a7f14dec6 b/...4c92784987012c6a44d6ddc18e7f7a4951d559c7e → ...24ea0076ff46b19abfab488d093a13a5a7f14dec6
diff --git a/...ca32b93247afb159b5e09613a8aafb4c2e71243bf → ...fcb21f82988ce8d227ab8906672c0494c72cdb4f9 b/...ca32b93247afb159b5e09613a8aafb4c2e71243bf → ...fcb21f82988ce8d227ab8906672c0494c72cdb4f9
diff --git a/latest-1/musl/amd64/image-config.json b/latest-1/musl/amd64/image-config.json
@@ -8,13 +8,13 @@
 	"history": [
 		{
 			"created": "2021-12-26T16:56:57Z",
-			"created_by": "BusyBox 1.35.0 (musl), Alpine 3.20.0"
+			"created_by": "BusyBox 1.35.0 (musl), Alpine 3.20.2"
 		}
 	],
 	"rootfs": {
 		"type": "layers",
 		"diff_ids": [
-			"sha256:94e0f174de0cfbe45e6120a840948123116ed3abb55cb023c10de16b808b935b"
+			"sha256:298a65a03e91edaef18f1b2420fa8db99ec93d4739f5a79b5a9f1ae87ad76700"
 		]
 	},
 	"architecture": "amd64",

diff --git a/latest-1/musl/amd64/image-manifest.json b/latest-1/musl/amd64/image-manifest.json
@@ -3,14 +3,14 @@
 	"mediaType": "application/vnd.oci.image.manifest.v1+json",
 	"config": {
 		"mediaType": "application/vnd.oci.image.config.v1+json",
-		"digest": "sha256:4be3e63228b904f37e4e761ca32b93247afb159b5e09613a8aafb4c2e71243bf",
+		"digest": "sha256:c00d1170401ed6acf293eaafcb21f82988ce8d227ab8906672c0494c72cdb4f9",
 		"size": 375
 	},
 	"layers": [
 		{
 			"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
-			"digest": "sha256:d4939ac1b9d185464548f0b439a045c00650eb998c51a88ed637b9b4bc569f89",
-			"size": 849283
+			"digest": "sha256:1f553cf7fa7b057d86820f44fd2889eacc63859abb1588d132dd8c5b37b87dbd",
+			"size": 849038
 		}
 	],
 	"annotations": {

diff --git a/latest-1/musl/amd64/index.json b/latest-1/musl/amd64/index.json
@@ -4,7 +4,7 @@
 	"manifests": [
 		{
 			"mediaType": "application/vnd.oci.image.manifest.v1+json",
-			"digest": "sha256:bd060a885638c42149802c64c92784987012c6a44d6ddc18e7f7a4951d559c7e",
+			"digest": "sha256:6474be0f487e4cdf08d13da24ea0076ff46b19abfab488d093a13a5a7f14dec6",
 			"size": 608,
 			"platform": {
 				"architecture": "amd64",

diff --git a/latest-1/uclibc/Dockerfile.builder b/latest-1/uclibc/Dockerfile.builder
diff --git a/...3ee1afa0cb6e5be7abcdb1e58d3be10856597f8e8 → ...b2f526bbe0137059aeaeadd34821ceff6d846f3f6 b/...3ee1afa0cb6e5be7abcdb1e58d3be10856597f8e8 → ...b2f526bbe0137059aeaeadd34821ceff6d846f3f6
diff --git a/...9f6924e4acf8e2178d5fdb01bd9346c450d4c848b → ...4db29d42e28cc7593eaaf61824e915b8391abb14f b/...9f6924e4acf8e2178d5fdb01bd9346c450d4c848b → ...4db29d42e28cc7593eaaf61824e915b8391abb14f
diff --git a/...6d157a7f7e5e6ff8bdca09cdcdc21270efeb15a5c → ...b154fa3785a0ad371f13af1b38fb3c2ca620e2b1d b/...6d157a7f7e5e6ff8bdca09cdcdc21270efeb15a5c → ...b154fa3785a0ad371f13af1b38fb3c2ca620e2b1d
diff --git a/latest-1/uclibc/amd64/image-config.json b/latest-1/uclibc/amd64/image-config.json
@@ -8,13 +8,13 @@
 	"history": [
 		{
 			"created": "2021-12-26T16:56:57Z",
-			"created_by": "BusyBox 1.35.0 (uclibc), Buildroot 2024.02.3, Debian 12"
+			"created_by": "BusyBox 1.35.0 (uclibc), Buildroot 2024.05.2, Debian 12"
 		}
 	],
 	"rootfs": {
 		"type": "layers",
 		"diff_ids": [
-			"sha256:1295fa3ca659275e20398bc56bede5df1f4513bdb116ce176ad2eb9b04c7a934"
+			"sha256:b7db3209f09b0229bfe4e7a82b43adfd84efd5280f35c9f431ec9f9325de02de"
 		]
 	},
 	"architecture": "amd64",

diff --git a/latest-1/uclibc/amd64/image-manifest.json b/latest-1/uclibc/amd64/image-manifest.json
@@ -3,14 +3,14 @@
 	"mediaType": "application/vnd.oci.image.manifest.v1+json",
 	"config": {
 		"mediaType": "application/vnd.oci.image.config.v1+json",
-		"digest": "sha256:a5c5db29c3dbe857b46d9bc6d157a7f7e5e6ff8bdca09cdcdc21270efeb15a5c",
+		"digest": "sha256:a74b3c951af9b45a1fa4ab2b154fa3785a0ad371f13af1b38fb3c2ca620e2b1d",
 		"size": 394
 	},
 	"layers": [
 		{
 			"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
-			"digest": "sha256:897ef0501f9d4fde77023379f6924e4acf8e2178d5fdb01bd9346c450d4c848b",
-			"size": 754332
+			"digest": "sha256:649377539ad4338c541b3cc4db29d42e28cc7593eaaf61824e915b8391abb14f",
+			"size": 749739
 		}
 	],
 	"annotations": {

diff --git a/latest-1/uclibc/amd64/index.json b/latest-1/uclibc/amd64/index.json
@@ -4,7 +4,7 @@
 	"manifests": [
 		{
 			"mediaType": "application/vnd.oci.image.manifest.v1+json",
-			"digest": "sha256:64c079486edc7c06377fa633ee1afa0cb6e5be7abcdb1e58d3be10856597f8e8",
+			"digest": "sha256:22944a6e10b2078ff66ba49b2f526bbe0137059aeaeadd34821ceff6d846f3f6",
 			"size": 610,
 			"platform": {
 				"architecture": "amd64",

diff --git a/latest/glibc/Dockerfile.builder b/latest/glibc/Dockerfile.builder
diff --git a/...81b2664b99d8a56dbca847bf62f2ef04854597cf8 → ...b358c8fbba6b0ab4e32171adba33058cf635923aa b/...81b2664b99d8a56dbca847bf62f2ef04854597cf8 → ...b358c8fbba6b0ab4e32171adba33058cf635923aa
diff --git a/...79e4610775e375524af00552fe871d3338261563c → ...ad3561e5bf28a7889d489320c7f39fa8cb54e82db b/...79e4610775e375524af00552fe871d3338261563c → ...ad3561e5bf28a7889d489320c7f39fa8cb54e82db
diff --git a/...4e790f586e9eda649ee9f130cd0e835b292bbc5ac → ...63642e39208c0e2b4afc833b4b3b01b8fef60ae9e b/...4e790f586e9eda649ee9f130cd0e835b292bbc5ac → ...63642e39208c0e2b4afc833b4b3b01b8fef60ae9e
diff --git a/latest/glibc/amd64/image-config.json b/latest/glibc/amd64/image-config.json
@@ -14,7 +14,7 @@
 	"rootfs": {
 		"type": "layers",
 		"diff_ids": [
-			"sha256:d51af96cf93e225825efd484ea457f867cb2b967f7415b9a3b7e65a2f803838a"
+			"sha256:e215fa422c604a8ea57ffcf6abc11e686d50a89f861c9b90adbb76033a956c66"
 		]
 	},
 	"architecture": "amd64",

diff --git a/latest/glibc/amd64/image-manifest.json b/latest/glibc/amd64/image-manifest.json
@@ -3,14 +3,14 @@
 	"mediaType": "application/vnd.oci.image.manifest.v1+json",
 	"config": {
 		"mediaType": "application/vnd.oci.image.config.v1+json",
-		"digest": "sha256:65ad0d468eb1c558bf7f4e64e790f586e9eda649ee9f130cd0e835b292bbc5ac",
+		"digest": "sha256:87ff76f62d367950186bde563642e39208c0e2b4afc833b4b3b01b8fef60ae9e",
 		"size": 372
 	},
 	"layers": [
 		{
 			"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
-			"digest": "sha256:ec562eabd705d25bfea8c8d79e4610775e375524af00552fe871d3338261563c",
-			"size": 2152663
+			"digest": "sha256:3d1a87f2317db629f710cbfad3561e5bf28a7889d489320c7f39fa8cb54e82db",
+			"size": 2152063
 		}
 	],
 	"annotations": {

diff --git a/latest/glibc/amd64/index.json b/latest/glibc/amd64/index.json
@@ -4,7 +4,7 @@
 	"manifests": [
 		{
 			"mediaType": "application/vnd.oci.image.manifest.v1+json",
-			"digest": "sha256:50aa4698fa6262977cff89181b2664b99d8a56dbca847bf62f2ef04854597cf8",
+			"digest": "sha256:1f3c4ec00c804f65805bd22b358c8fbba6b0ab4e32171adba33058cf635923aa",
 			"size": 610,
 			"platform": {
 				"architecture": "amd64",

diff --git a/latest/musl/Dockerfile.builder b/latest/musl/Dockerfile.builder
diff --git a/...a59ff847a686ce63d9a86ca3ece325fbfc8443b99 → ...ddd322bea6dc74aa0b8e1e74b54648a2c876c872e b/...a59ff847a686ce63d9a86ca3ece325fbfc8443b99 → ...ddd322bea6dc74aa0b8e1e74b54648a2c876c872e
diff --git a/...a8344905e8a3181a02f251216b104b4daea5c3984 → ...8688c3a69e75bd36056183036a1f24ff0f985cef7 b/...a8344905e8a3181a02f251216b104b4daea5c3984 → ...8688c3a69e75bd36056183036a1f24ff0f985cef7
diff --git a/...2f5715ede91c1ae869d91edf5f6adf88ed54e97cf → ...4c4e7746f6b24ea2068efe62b537c37f9b72cbf79 b/...2f5715ede91c1ae869d91edf5f6adf88ed54e97cf → ...4c4e7746f6b24ea2068efe62b537c37f9b72cbf79
diff --git a/latest/musl/amd64/image-config.json b/latest/musl/amd64/image-config.json
@@ -8,13 +8,13 @@
 	"history": [
 		{
 			"created": "2023-05-18T22:34:17Z",
-			"created_by": "BusyBox 1.36.1 (musl), Alpine 3.20.0"
+			"created_by": "BusyBox 1.36.1 (musl), Alpine 3.20.2"
 		}
 	],
 	"rootfs": {
 		"type": "layers",
 		"diff_ids": [
-			"sha256:c3136a3b698a9f25d09d8169258a08c3d3965f065186fe2a91549859fa45d1cc"
+			"sha256:19823cff13d4946ba7b6308a7bc609d4b99a223bc3c24f47ee66ad3b99bafaa0"
 		]
 	},
 	"architecture": "amd64",

diff --git a/latest/musl/amd64/image-manifest.json b/latest/musl/amd64/image-manifest.json
@@ -3,14 +3,14 @@
 	"mediaType": "application/vnd.oci.image.manifest.v1+json",
 	"config": {
 		"mediaType": "application/vnd.oci.image.config.v1+json",
-		"digest": "sha256:615b080b9dbe1288d4b5a69a8344905e8a3181a02f251216b104b4daea5c3984",
+		"digest": "sha256:443490188dc7dec7a6bb4bc8688c3a69e75bd36056183036a1f24ff0f985cef7",
 		"size": 375
 	},
 	"layers": [
 		{
 			"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
-			"digest": "sha256:da76cf628912174a928f788a59ff847a686ce63d9a86ca3ece325fbfc8443b99",
-			"size": 852608
+			"digest": "sha256:3abb9a39864f49ab85e89e9ddd322bea6dc74aa0b8e1e74b54648a2c876c872e",
+			"size": 852275
 		}
 	],
 	"annotations": {

diff --git a/latest/musl/amd64/index.json b/latest/musl/amd64/index.json
@@ -4,7 +4,7 @@
 	"manifests": [
 		{
 			"mediaType": "application/vnd.oci.image.manifest.v1+json",
-			"digest": "sha256:6d9a2e77c3b19944a28c3922f5715ede91c1ae869d91edf5f6adf88ed54e97cf",
+			"digest": "sha256:5a3e083edd9b641304256c54c4e7746f6b24ea2068efe62b537c37f9b72cbf79",
 			"size": 608,
 			"platform": {
 				"architecture": "amd64",

diff --git a/latest/uclibc/Dockerfile.builder b/latest/uclibc/Dockerfile.builder
diff --git a/...4df1a6aa649cbeccdf69f4fa4c9d6d6524998d67f → ...25ba977920cdb16787776ec4e6e8ab360c7f66b14 b/...4df1a6aa649cbeccdf69f4fa4c9d6d6524998d67f → ...25ba977920cdb16787776ec4e6e8ab360c7f66b14
diff --git a/...f59b2068c468e1bb7a29f6e9e68ee268852a83290 → ...9648e3d5ba5fc7447e5da922d2cbd409b3c605d82 b/...f59b2068c468e1bb7a29f6e9e68ee268852a83290 → ...9648e3d5ba5fc7447e5da922d2cbd409b3c605d82
diff --git a/...7ff2cb9df3a17c5f3ba6840a91be1c1734d3ebd7b → ...2034c6306fdb4792f89ee929f0b2b353954ed039f b/...7ff2cb9df3a17c5f3ba6840a91be1c1734d3ebd7b → ...2034c6306fdb4792f89ee929f0b2b353954ed039f
diff --git a/latest/uclibc/amd64/image-config.json b/latest/uclibc/amd64/image-config.json
@@ -8,13 +8,13 @@
 	"history": [
 		{
 			"created": "2023-05-18T22:34:17Z",
-			"created_by": "BusyBox 1.36.1 (uclibc), Buildroot 2024.02.3, Debian 12"
+			"created_by": "BusyBox 1.36.1 (uclibc), Buildroot 2024.05.2, Debian 12"
 		}
 	],
 	"rootfs": {
 		"type": "layers",
 		"diff_ids": [
-			"sha256:dc28b2a42639abf9f34f458e7b1aab134392e8d0b38ad1ac6228d39617654c01"
+			"sha256:c5e357d47221c5c5e11db675fd189ac425a4c96fe297785d18fb7cf92c943749"
 		]
 	},
 	"architecture": "amd64",