Update "glibc" variants to be the default variants

tianon · tianon · commit 4858368d40b2 · 2022-12-05T11:31:49.000-08:00
This follows buildroot/buildroot@4057e36
diff --git a/versions.json b/versions.json
@@ -5,8 +5,8 @@
     },
     "sha256": "415fbd89e5344c96acf449d94a6f956dbed62e18e835fc83e064db33a34bd549",
     "variants": [
-      "uclibc",
       "glibc",
+      "uclibc",
       "musl"
     ],
     "version": "1.34.1"
@@ -17,8 +17,8 @@
     },
     "sha256": "faeeb244c35a348a334f4a59e44626ee870fb07b6884d68c10ae8bc19f83a694",
     "variants": [
-      "uclibc",
       "glibc",
+      "uclibc",
       "musl"
     ],
     "version": "1.35.0"
diff --git a/versions.sh b/versions.sh
@@ -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")
 			}
 		'

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