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.

Author: tianon

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

latest-1/glibc/Dockerfile.builder

@@ -14,7 +14,7 @@
 	"rootfs": {
 		"type": "layers",
 		"diff_ids": [
-			"sha256:87f834448d48e9a743b0d5cb193d640d2269786bbfb01e79eb3eee34c9d9d961"
+			"sha256:7ace9a007a594ecb15f1e037f33d48e9709a4f34fdedb8a42fa47ed84c53d44f"
 		]
 	},
 	"architecture": "amd64",

…a863e2e6015c9983c957cf1b068120aea609261d …dae6352a1d079acb9e0c413d28ae3bb0a5a226b2latest-1/glibc/amd64/blobs/sha256/5b6e7aeda43f426b6423f60da863e2e6015c9983c957cf1b068120aea609261d renamed to latest-1/glibc/amd64/blobs/sha256/48a34a0f9b4b6bd3db1a8ba1dae6352a1d079acb9e0c413d28ae3bb0a5a226b2 latest-1/glibc/amd64/blobs/sha256/5b6e7aeda43f426b6423f60da863e2e6015c9983c957cf1b068120aea609261d renamed to latest-1/glibc/amd64/blobs/sha256/48a34a0f9b4b6bd3db1a8ba1dae6352a1d079acb9e0c413d28ae3bb0a5a226b2

@@ -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": {

…bdbbfdfe6eca9307d1787c2cd4391002a1fe3b76 …1eb68691c00b6af0c14a9988ad3fa3501d155499latest-1/glibc/amd64/blobs/sha256/bd816a2942336ab9a44b9f6fbdbbfdfe6eca9307d1787c2cd4391002a1fe3b76 renamed to latest-1/glibc/amd64/blobs/sha256/8563b78c9f94f4fa19ce11171eb68691c00b6af0c14a9988ad3fa3501d155499 latest-1/glibc/amd64/blobs/sha256/bd816a2942336ab9a44b9f6fbdbbfdfe6eca9307d1787c2cd4391002a1fe3b76 renamed to latest-1/glibc/amd64/blobs/sha256/8563b78c9f94f4fa19ce11171eb68691c00b6af0c14a9988ad3fa3501d155499

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