WIP Switch freebsd image to 13.2 (fixes #1390)

12.4 is EOL so we must move on. We keep the toolchain version for now, but it is very old.
cross-rs · Jan 4, 2024 · 14c15b5 · 14c15b5
1 parent 9c82f32
commit 14c15b5
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased] - ReleaseDate
 
+### Fixed
+
+- #1390 - switch to freebsd 13.2 following 12.4 EoL
+
 ## [v0.2.5] - 2023-02-04
 
 ## Fixed

diff --git a/docker/Dockerfile.aarch64-unknown-freebsd b/docker/Dockerfile.aarch64-unknown-freebsd
@@ -21,8 +21,8 @@ COPY freebsd-install.sh /
 COPY freebsd-extras.sh /
 RUN /freebsd-extras.sh
 
-ENV CROSS_TOOLCHAIN_PREFIX=aarch64-unknown-freebsd12-
-ENV CROSS_SYSROOT=/usr/local/aarch64-unknown-freebsd12
+ENV CROSS_TOOLCHAIN_PREFIX=aarch64-unknown-freebsd13-
+ENV CROSS_SYSROOT=/usr/local/aarch64-unknown-freebsd13
 
 COPY freebsd-gcc.sh /usr/bin/"$CROSS_TOOLCHAIN_PREFIX"gcc.sh
 COPY toolchain.cmake /opt/toolchain.cmake

diff --git a/docker/Dockerfile.i686-unknown-freebsd b/docker/Dockerfile.i686-unknown-freebsd
@@ -21,8 +21,8 @@ COPY freebsd-install.sh /
 COPY freebsd-extras.sh /
 RUN /freebsd-extras.sh
 
-ENV CROSS_TOOLCHAIN_PREFIX=i686-unknown-freebsd12-
-ENV CROSS_SYSROOT=/usr/local/i686-unknown-freebsd12
+ENV CROSS_TOOLCHAIN_PREFIX=i686-unknown-freebsd13-
+ENV CROSS_SYSROOT=/usr/local/i686-unknown-freebsd13
 
 COPY freebsd-gcc.sh /usr/bin/"$CROSS_TOOLCHAIN_PREFIX"gcc.sh
 COPY toolchain.cmake /opt/toolchain.cmake

diff --git a/docker/Dockerfile.x86_64-unknown-freebsd b/docker/Dockerfile.x86_64-unknown-freebsd
@@ -21,8 +21,8 @@ COPY freebsd-install.sh /
 COPY freebsd-extras.sh /
 RUN /freebsd-extras.sh
 
-ENV CROSS_TOOLCHAIN_PREFIX=x86_64-unknown-freebsd12-
-ENV CROSS_SYSROOT=/usr/local/x86_64-unknown-freebsd12
+ENV CROSS_TOOLCHAIN_PREFIX=x86_64-unknown-freebsd13-
+ENV CROSS_SYSROOT=/usr/local/x86_64-unknown-freebsd13
 
 COPY freebsd-gcc.sh /usr/bin/"$CROSS_TOOLCHAIN_PREFIX"gcc.sh
 COPY toolchain.cmake /opt/toolchain.cmake

diff --git a/docker/freebsd-common.sh b/docker/freebsd-common.sh
@@ -19,4 +19,4 @@ case "${ARCH}" in
         ;;
 esac
 
-export FREEBSD_MAJOR=12
+export FREEBSD_MAJOR=13
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,4 +19,4 @@ case "${ARCH}" in @@
             ;;
     esac
-    export FREEBSD_MAJOR=12
+    export FREEBSD_MAJOR=13