Skip to content

Commit e487f8a

Browse files
authored
Update arm toolchains to bookworm (#230)
1 parent 7730d28 commit e487f8a

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

ToolchainPlugin/src/main/java/edu/wpi/first/toolchain/arm32/Arm32ToolchainExtension.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
import edu.wpi.first.toolchain.opensdk.OpenSdkToolchainExtension;
66

77
public abstract class Arm32ToolchainExtension extends OpenSdkToolchainExtension {
8-
public static final String TOOLCHAIN_VERSION = "2025-10.2.0";
8+
public static final String TOOLCHAIN_VERSION = "2025-12.2.0";
99
public static final String INSTALL_SUBDIR = "arm32";
1010

1111
@Inject
1212
public Arm32ToolchainExtension() {
1313
super();
14-
getVersionLow().convention("10.2.0");
15-
getVersionHigh().convention("10.2.0");
14+
getVersionLow().convention("12.2.0");
15+
getVersionHigh().convention("12.2.0");
1616
getToolchainVersion().convention(TOOLCHAIN_VERSION);
1717
}
1818
}

ToolchainPlugin/src/main/java/edu/wpi/first/toolchain/arm32/Arm32ToolchainPlugin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
public class Arm32ToolchainPlugin implements Plugin<Project> {
1616

1717
public static final String toolchainName = "arm32";
18-
public static final String baseToolchainName = "armhf-raspi-bullseye";
18+
public static final String baseToolchainName = "armhf-raspi-bookworm";
1919

2020
private Arm32ToolchainExtension arm32Ext;
2121
private OpenSdkToolchainBase opensdk;
@@ -35,7 +35,7 @@ public void apply(Project project) {
3535
ToolchainExtension toolchainExt = project.getExtensions().getByType(ToolchainExtension.class);
3636

3737
opensdk = new OpenSdkToolchainBase(baseToolchainName, arm32Ext, project, Arm32ToolchainExtension.INSTALL_SUBDIR,
38-
"raspi-bullseye", project.provider(() -> "armv6-bullseye-linux-gnueabihf"),
38+
"raspi-bookworm", project.provider(() -> "armv6-bookworm-linux-gnueabihf"),
3939
toolchainExt.getToolchainGraphService(), operations);
4040

4141
CrossCompilerConfiguration configuration = project.getObjects().newInstance(CrossCompilerConfiguration.class,

ToolchainPlugin/src/main/java/edu/wpi/first/toolchain/arm64/Arm64ToolchainExtension.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
import edu.wpi.first.toolchain.opensdk.OpenSdkToolchainExtension;
66

77
public abstract class Arm64ToolchainExtension extends OpenSdkToolchainExtension {
8-
public static final String TOOLCHAIN_VERSION = "2025-10.2.0";
8+
public static final String TOOLCHAIN_VERSION = "2025-12.2.0";
99
public static final String INSTALL_SUBDIR = "arm64";
1010

1111
@Inject
1212
public Arm64ToolchainExtension() {
1313
super();
14-
getVersionLow().convention("10.2.0");
15-
getVersionHigh().convention("10.2.0");
14+
getVersionLow().convention("12.2.0");
15+
getVersionHigh().convention("12.2.0");
1616
getToolchainVersion().convention(TOOLCHAIN_VERSION);
1717
}
1818
}

ToolchainPlugin/src/main/java/edu/wpi/first/toolchain/arm64/Arm64ToolchainPlugin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
public class Arm64ToolchainPlugin implements Plugin<Project> {
1616

1717
public static final String toolchainName = "arm64";
18-
public static final String baseToolchainName = "arm64-bullseye";
18+
public static final String baseToolchainName = "arm64-bookworm";
1919

2020
private Arm64ToolchainExtension arm64Ext;
2121
private OpenSdkToolchainBase opensdk;
@@ -33,7 +33,7 @@ public void apply(Project project) {
3333
ToolchainExtension toolchainExt = project.getExtensions().getByType(ToolchainExtension.class);
3434

3535
opensdk = new OpenSdkToolchainBase(baseToolchainName, arm64Ext, project, Arm64ToolchainExtension.INSTALL_SUBDIR,
36-
"bullseye", project.provider(() -> "aarch64-bullseye-linux-gnu"),
36+
"bookworm", project.provider(() -> "aarch64-bookworm-linux-gnu"),
3737
toolchainExt.getToolchainGraphService(), operations);
3838

3939
CrossCompilerConfiguration configuration = project.getObjects().newInstance(CrossCompilerConfiguration.class,

ToolchainPlugin/src/main/java/edu/wpi/first/toolchain/opensdk/OpenSdkToolchainBase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ private String toolchainRemoteFile() {
5353
} else {
5454
String desktopPlatformArch = NativePlatforms.desktopPlatformArch(operations);
5555
if (desktopPlatformArch.equals(NativePlatforms.arm64arch)) {
56-
platformId = "aarch64-bullseye-linux-gnu";
56+
platformId = "aarch64-bookworm-linux-gnu";
5757
} else if (desktopPlatformArch.equals(NativePlatforms.arm32arch)) {
58-
platformId = "armv6-bullseye-linux-gnueabihf";
58+
platformId = "armv6-bookworm-linux-gnueabihf";
5959
} else {
6060
platformId = "x86_64-linux-gnu";
6161
}

0 commit comments

Comments
 (0)