feat: update grub to 2.06, bump max CPUs to 512

Nowadays systems with > 64 cores are common, so limit of 64 for amd64 doesn't make sense anymore. Bump arm64 to keep arches in sync. Uupdate GRUB to 2.06 See https://fossies.org/diffs/grub/2.04_vs_2.06/ChangeLog-diff.html Signed-off-by: Andrey Smirnov <smirnov.andrey@gmail.com> (cherry picked from commit 0c011c0) (cherry picked from commit 12856ce)
siderolabs · Aug 9, 2021 · 4253991 · 4253991
1 parent 752c90e
commit 4253991
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/grub/pkg.yaml b/grub/pkg.yaml
@@ -6,10 +6,10 @@ dependencies:
   - stage: util-linux
 steps:
   - sources:
-      - url: https://ftp.gnu.org/gnu/grub/grub-2.04.tar.xz
+      - url: https://ftp.gnu.org/gnu/grub/grub-2.06.tar.xz
         destination: grub.tar.xz
-        sha256: e5292496995ad42dabe843a0192cf2a2c502e7ffcc7479398232b10a472df77d
-        sha512: 9c15c42d0cf5d61446b752194e3b628bb04be0fe6ea0240ab62b3d753784712744846e1f7c3651d8e0968d22012e6d713c38c44936d4004ded3ca4d4007babbb
+        sha256: b79ea44af91b93d17cd3fe80bdae6ed43770678a9a5ae192ccea803ebb657ee1
+        sha512: 4f11c648f3078567e53fc0c74d5026fdc6da4be27d188975e79d9a4df817ade0fe5ad2ddd694238a07edc45adfa02943d83c57767dd51548102b375e529e8efe
     env: # disable any optimizations, as this breaks GRUB build
       CFLAGS: ""
       CXXFLAGS: ""

diff --git a/kernel/kernel/config-amd64 b/kernel/kernel/config-amd64
@@ -372,7 +372,7 @@ CONFIG_DMI=y
 CONFIG_NR_CPUS_RANGE_BEGIN=2
 CONFIG_NR_CPUS_RANGE_END=512
 CONFIG_NR_CPUS_DEFAULT=64
-CONFIG_NR_CPUS=64
+CONFIG_NR_CPUS=512
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_MC_PRIO=y

diff --git a/kernel/kernel/config-arm64 b/kernel/kernel/config-arm64
@@ -377,7 +377,7 @@ CONFIG_ARM64_PA_BITS=48
 CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_SMT=y
-CONFIG_NR_CPUS=256
+CONFIG_NR_CPUS=512
 CONFIG_HOTPLUG_CPU=y
 CONFIG_NUMA=y
 CONFIG_NODES_SHIFT=6