From e758fa3af4aa7650919609079536ef21aae8a7a7 Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Fri, 6 Dec 2024 12:44:11 -0800 Subject: [PATCH] Upgrade arm32 and arm64 compilers to bookworm --- .../edu/wpi/first/toolchain/arm32/Arm32ToolchainPlugin.java | 4 ++-- .../edu/wpi/first/toolchain/arm64/Arm64ToolchainPlugin.java | 4 ++-- .../edu/wpi/first/toolchain/opensdk/OpenSdkToolchainBase.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) 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 index 789fdb1..d8ac10f 100644 --- 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 { 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/Arm64ToolchainPlugin.java b/ToolchainPlugin/src/main/java/edu/wpi/first/toolchain/arm64/Arm64ToolchainPlugin.java index 93fe460..887f235 100644 --- 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 { 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 index c814168..f438038 100644 --- 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"; }