Update arm toolchains to bookworm (#230)

wpilibsuite · Dec 6, 2024 · e487f8a · e487f8a
1 parent 7730d28
commit e487f8a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/ToolchainPlugin/src/main/java/edu/wpi/first/toolchain/arm32/Arm32ToolchainExtension.java b/ToolchainPlugin/src/main/java/edu/wpi/first/toolchain/arm32/Arm32ToolchainExtension.java
@@ -5,14 +5,14 @@
 import edu.wpi.first.toolchain.opensdk.OpenSdkToolchainExtension;
 
 public abstract class Arm32ToolchainExtension extends OpenSdkToolchainExtension {
-    public static final String TOOLCHAIN_VERSION = "2025-10.2.0";
+    public static final String TOOLCHAIN_VERSION = "2025-12.2.0";
     public static final String INSTALL_SUBDIR = "arm32";
 
     @Inject
     public Arm32ToolchainExtension() {
         super();
-        getVersionLow().convention("10.2.0");
-        getVersionHigh().convention("10.2.0");
+        getVersionLow().convention("12.2.0");
+        getVersionHigh().convention("12.2.0");
         getToolchainVersion().convention(TOOLCHAIN_VERSION);
     }
 }
diff --git a/ToolchainPlugin/src/main/java/edu/wpi/first/toolchain/arm32/Arm32ToolchainPlugin.java b/ToolchainPlugin/src/main/java/edu/wpi/first/toolchain/arm32/Arm32ToolchainPlugin.java
@@ -15,7 +15,7 @@
 public class Arm32ToolchainPlugin implements Plugin<Project> {
 
     public static final String toolchainName = "arm32";
-    public static final String baseToolchainName = "armhf-raspi-bullseye";
+    public static final String baseToolchainName = "armhf-raspi-bookworm";
 
     private Arm32ToolchainExtension arm32Ext;
     private OpenSdkToolchainBase opensdk;
@@ -35,7 +35,7 @@ public void apply(Project project) {
         ToolchainExtension toolchainExt = project.getExtensions().getByType(ToolchainExtension.class);
 
         opensdk = new OpenSdkToolchainBase(baseToolchainName, arm32Ext, project, Arm32ToolchainExtension.INSTALL_SUBDIR,
-                "raspi-bullseye", project.provider(() -> "armv6-bullseye-linux-gnueabihf"),
+                "raspi-bookworm", project.provider(() -> "armv6-bookworm-linux-gnueabihf"),
                 toolchainExt.getToolchainGraphService(), operations);
 
         CrossCompilerConfiguration configuration = project.getObjects().newInstance(CrossCompilerConfiguration.class,

diff --git a/ToolchainPlugin/src/main/java/edu/wpi/first/toolchain/arm64/Arm64ToolchainExtension.java b/ToolchainPlugin/src/main/java/edu/wpi/first/toolchain/arm64/Arm64ToolchainExtension.java
@@ -5,14 +5,14 @@
 import edu.wpi.first.toolchain.opensdk.OpenSdkToolchainExtension;
 
 public abstract class Arm64ToolchainExtension extends OpenSdkToolchainExtension {
-    public static final String TOOLCHAIN_VERSION = "2025-10.2.0";
+    public static final String TOOLCHAIN_VERSION = "2025-12.2.0";
     public static final String INSTALL_SUBDIR = "arm64";
 
     @Inject
     public Arm64ToolchainExtension() {
         super();
-        getVersionLow().convention("10.2.0");
-        getVersionHigh().convention("10.2.0");
+        getVersionLow().convention("12.2.0");
+        getVersionHigh().convention("12.2.0");
         getToolchainVersion().convention(TOOLCHAIN_VERSION);
     }
 }
diff --git a/ToolchainPlugin/src/main/java/edu/wpi/first/toolchain/arm64/Arm64ToolchainPlugin.java b/ToolchainPlugin/src/main/java/edu/wpi/first/toolchain/arm64/Arm64ToolchainPlugin.java
@@ -15,7 +15,7 @@
 public class Arm64ToolchainPlugin implements Plugin<Project> {
 
     public static final String toolchainName = "arm64";
-    public static final String baseToolchainName = "arm64-bullseye";
+    public static final String baseToolchainName = "arm64-bookworm";
 
     private Arm64ToolchainExtension arm64Ext;
     private OpenSdkToolchainBase opensdk;
@@ -33,7 +33,7 @@ public void apply(Project project) {
         ToolchainExtension toolchainExt = project.getExtensions().getByType(ToolchainExtension.class);
 
         opensdk = new OpenSdkToolchainBase(baseToolchainName, arm64Ext, project, Arm64ToolchainExtension.INSTALL_SUBDIR,
-                "bullseye", project.provider(() -> "aarch64-bullseye-linux-gnu"),
+                "bookworm", project.provider(() -> "aarch64-bookworm-linux-gnu"),
                 toolchainExt.getToolchainGraphService(), operations);
 
         CrossCompilerConfiguration configuration = project.getObjects().newInstance(CrossCompilerConfiguration.class,

diff --git a/ToolchainPlugin/src/main/java/edu/wpi/first/toolchain/opensdk/OpenSdkToolchainBase.java b/ToolchainPlugin/src/main/java/edu/wpi/first/toolchain/opensdk/OpenSdkToolchainBase.java
@@ -53,9 +53,9 @@ private String toolchainRemoteFile() {
         } else {
             String desktopPlatformArch = NativePlatforms.desktopPlatformArch(operations);
             if (desktopPlatformArch.equals(NativePlatforms.arm64arch)) {
-                platformId = "aarch64-bullseye-linux-gnu";
+                platformId = "aarch64-bookworm-linux-gnu";
             } else if (desktopPlatformArch.equals(NativePlatforms.arm32arch)) {
-                platformId = "armv6-bullseye-linux-gnueabihf";
+                platformId = "armv6-bookworm-linux-gnueabihf";
             } else {
                 platformId = "x86_64-linux-gnu";
             }