Merge pull request #154 from infosiftr/buildroot-2022.11

Update buildroot to 2022.11

Author: tianon

Dockerfile-builder.template

@@ -83,15 +83,18 @@ RUN set -eux; \
 	\
 	unsetConfs=' \
 		BR2_SHARED_LIBS \
+		BR2_TOOLCHAIN_BUILDROOT_GLIBC \
 	'; \
 	\
 # buildroot arches: https://git.busybox.net/buildroot/tree/arch
 # buildroot+uclibc arches: https://git.busybox.net/buildroot/tree/package/uclibc/Config.in ("config BR2_PACKAGE_UCLIBC_ARCH_SUPPORTS")
 	dpkgArch="$(dpkg --print-architecture)"; \
 	case "$dpkgArch" in \
+# explicitly target amd64 v1
 		amd64) \
 			setConfs="$setConfs \
 				BR2_x86_64=y \
+				BR2_x86_x86_64=y \
 			"; \
 			;; \
 			\

stable/glibc/Dockerfile.builder

@@ -1,24 +1,24 @@
 {
   "stable": {
     "buildroot": {
-      "version": "2022.08.2"
+      "version": "2022.11"
     },
     "sha256": "415fbd89e5344c96acf449d94a6f956dbed62e18e835fc83e064db33a34bd549",
     "variants": [
-      "uclibc",
       "glibc",
+      "uclibc",
       "musl"
     ],
     "version": "1.34.1"
   },
   "unstable": {
     "buildroot": {
-      "version": "2022.08.2"
+      "version": "2022.11"
     },
     "sha256": "faeeb244c35a348a334f4a59e44626ee870fb07b6884d68c10ae8bc19f83a694",
     "variants": [
-      "uclibc",
       "glibc",
+      "uclibc",
       "musl"
     ],
     "version": "1.35.0"

stable/musl/Dockerfile.builder

@@ -56,9 +56,9 @@ for version in "${versions[@]}"; do
 				buildroot: {
 					version: env.buildrootVersion,
 				},
-				# prefer uclibc, but if unavailable use glibc since it has less "edge case" behavior
+				# as of buildroot 2022.11, glibc is the default, so we follow suit (https://github.com/buildroot/buildroot/commit/4057e36ca9665edd5248512e4edba2c243b8f4be)
 				# https://busybox.net/FAQ.html#libc
-				variants: [ "uclibc", "glibc", "musl" ],
+				variants: [ "glibc", "uclibc", "musl" ],
 				# (order here determines "preference" for representing "latest")
 			}
 		'