2025 Updates (#32)

wpilibsuite · Nov 29, 2024 · 8cda58e · 8cda58e
1 parent db03ce2
commit 8cda58e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -23,7 +23,7 @@ build/base:
 
 build/cross: build/base
 	cd roborio-cross-ubuntu && \
-	    docker build -t ${DOCKER_USER}/roborio-cross-ubuntu:2024-${UBUNTU} -f Dockerfile.2024 --build-arg UBUNTU=${UBUNTU} --build-arg TYPE=base .
+	    docker build -t ${DOCKER_USER}/roborio-cross-ubuntu:2025-${UBUNTU} -f Dockerfile.2025 --build-arg UBUNTU=${UBUNTU} --build-arg TYPE=base .
 	cd systemcore-cross-ubuntu && \
 	    docker build -t ${DOCKER_USER}/systemcore-cross-ubuntu:2025-${UBUNTU} -f Dockerfile.2025 --build-arg UBUNTU=${UBUNTU} --build-arg TYPE=base .
 	cd raspbian-cross-ubuntu && \
@@ -37,7 +37,7 @@ build/minimal-base:
 
 build/minimal-cross: build/minimal-base
 	cd roborio-cross-ubuntu && \
-	    docker build -t ${DOCKER_USER}/roborio-cross-ubuntu-minimal:2024-${UBUNTU} -f Dockerfile.2024 --build-arg UBUNTU=${UBUNTU} --build-arg TYPE=minimal-base .
+	    docker build -t ${DOCKER_USER}/roborio-cross-ubuntu-minimal:2025-${UBUNTU} -f Dockerfile.2025 --build-arg UBUNTU=${UBUNTU} --build-arg TYPE=minimal-base .
 	cd systemcore-cross-ubuntu && \
 	    docker build -t ${DOCKER_USER}/systemcore-cross-ubuntu-minimal:2025-${UBUNTU} -f Dockerfile.2025 --build-arg UBUNTU=${UBUNTU} --build-arg TYPE=minimal-base .
 	cd raspbian-cross-ubuntu && \
@@ -56,7 +56,7 @@ push/base:
 	docker push ${DOCKER_USER}/gazebo-ubuntu:${UBUNTU}
 
 push/cross: push/base
-	docker push ${DOCKER_USER}/roborio-cross-ubuntu:2024-${UBUNTU}
+	docker push ${DOCKER_USER}/roborio-cross-ubuntu:2025-${UBUNTU}
 	docker push ${DOCKER_USER}/systemcore-cross-ubuntu:2025-${UBUNTU}
 	docker push ${DOCKER_USER}/raspbian-cross-ubuntu:bullseye-${UBUNTU}
 	docker push ${DOCKER_USER}/aarch64-cross-ubuntu:bullseye-${UBUNTU}
@@ -65,7 +65,7 @@ push/minimal-base:
 	docker push ${DOCKER_USER}/ubuntu-minimal-base:${UBUNTU}
 
 push/minimal-cross: push/minimal-base
-	docker push ${DOCKER_USER}/roborio-cross-ubuntu-minimal:2024-${UBUNTU}
+	docker push ${DOCKER_USER}/roborio-cross-ubuntu-minimal:2025-${UBUNTU}
 	docker push ${DOCKER_USER}/systemcore-cross-ubuntu-minimal:2025-${UBUNTU}
 	docker push ${DOCKER_USER}/raspbian-cross-ubuntu-minimal:bullseye-${UBUNTU}
 	docker push ${DOCKER_USER}/aarch64-cross-ubuntu-minimal:bullseye-${UBUNTU}
@@ -76,7 +76,7 @@ push/opensdk:
 
 .PHONY: save/minimal-cross
 save/minimal-cross:
-	docker save ${DOCKER_USER}/roborio-cross-ubuntu-minimal:2024-${UBUNTU} | gzip > roborio.tar.gz
+	docker save ${DOCKER_USER}/roborio-cross-ubuntu-minimal:2025-${UBUNTU} | gzip > roborio.tar.gz
 	docker save ${DOCKER_USER}/systemcore-cross-ubuntu-minimal:2025-${UBUNTU} | gzip > systemcore.tar.gz
 	docker save ${DOCKER_USER}/raspbian-cross-ubuntu-minimal:bullseye-${UBUNTU} | gzip > raspbian.tar.gz
 	docker save ${DOCKER_USER}/aarch64-cross-ubuntu-minimal:bullseye-${UBUNTU} | gzip > aarch64.tar.gz

diff --git a/aarch64-cross-ubuntu/Dockerfile.bullseye b/aarch64-cross-ubuntu/Dockerfile.bullseye
@@ -3,6 +3,6 @@ ARG TYPE=base
 FROM wpilib/ubuntu-${TYPE}:${UBUNTU}
 
 # Install toolchain
-RUN curl -SL https://github.com/wpilibsuite/opensdk/releases/download/v2024-1/arm64-bullseye-2024-x86_64-linux-gnu-Toolchain-10.2.0.tgz | sh -c 'mkdir -p /usr/local && cd /usr/local && tar xzf - --strip-components=2'
+RUN curl -SL https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/arm64-bullseye-2025-x86_64-linux-gnu-Toolchain-10.2.0.tgz | sh -c 'mkdir -p /usr/local && cd /usr/local && tar xzf - --strip-components=2'
 
 WORKDIR /
diff --git a/cross-ubuntu-py/py.mk b/cross-ubuntu-py/py.mk
@@ -14,9 +14,9 @@ TARGET_HOST_AARCH64=aarch64-bullseye-linux-gnu
 AC_TARGET_HOST_AARCH64=aarch64-bullseye-linux-gnu
 
 TYPE_ROBORIO=roborio
-VERSION_ROBORIO=2024
-TARGET_HOST_ROBORIO=arm-frc2024-linux-gnueabi
-AC_TARGET_HOST_ROBORIO=armv7l-frc2024-linux-gnueabi
+VERSION_ROBORIO=2025
+TARGET_HOST_ROBORIO=arm-frc2025-linux-gnueabi
+AC_TARGET_HOST_ROBORIO=armv7l-frc2025-linux-gnueabi
 
 
 .PHONY: build/cross-python

diff --git a/raspbian-cross-ubuntu/Dockerfile.bullseye b/raspbian-cross-ubuntu/Dockerfile.bullseye
@@ -4,6 +4,6 @@ FROM wpilib/ubuntu-${TYPE}:${UBUNTU}
 
 
 # Install toolchain
-RUN curl -SL https://github.com/wpilibsuite/opensdk/releases/download/v2024-1/armhf-raspi-bullseye-2024-x86_64-linux-gnu-Toolchain-10.2.0.tgz | sh -c 'mkdir -p /usr/local && cd /usr/local && tar xzf - --strip-components=2'
+RUN curl -SL https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/armhf-raspi-bullseye-2025-x86_64-linux-gnu-Toolchain-10.2.0.tgz | sh -c 'mkdir -p /usr/local && cd /usr/local && tar xzf - --strip-components=2'
 
 WORKDIR /
diff --git a/roborio-cross-ubuntu/Dockerfile.2024 → roborio-cross-ubuntu/Dockerfile.2025 b/roborio-cross-ubuntu/Dockerfile.2024 → roborio-cross-ubuntu/Dockerfile.2025
@@ -3,6 +3,6 @@ ARG TYPE=base
 FROM wpilib/ubuntu-${TYPE}:${UBUNTU}
 
 # Install toolchain
-RUN curl -SL https://github.com/wpilibsuite/opensdk/releases/download/v2024-1/cortexa9_vfpv3-roborio-academic-2024-x86_64-linux-gnu-Toolchain-12.1.0.tgz | sh -c 'mkdir -p /usr/local && cd /usr/local && tar xzf - --strip-components=2'
+RUN curl -SL https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/cortexa9_vfpv3-roborio-academic-2025-x86_64-linux-gnu-Toolchain-12.1.0.tgz | sh -c 'mkdir -p /usr/local && cd /usr/local && tar xzf - --strip-components=2'
 
 WORKDIR /