Switch to FreeBSD 13.2 (#1403)

Rerolling #1401 following GH closing it on push mistake - :sigh:
cross-rs · Jan 9, 2024 · 78c0117 · 78c0117
2 parents 28d1b16 + 8239f50
commit 78c0117
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 8 deletions.
diff --git a/.changes/1390.json b/.changes/1390.json
@@ -0,0 +1,5 @@
+{
+    "type": "fixed",
+    "description": "switch to freebsd 13.2 following 12.4 EoL",
+    "issues": [1390]
+}
diff --git a/docker/Dockerfile.aarch64-unknown-freebsd b/docker/Dockerfile.aarch64-unknown-freebsd
@@ -21,12 +21,16 @@ 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
 
+COPY freebsd-fetch-best-mirror.sh /
+COPY freebsd-setup-packagesite.sh /
+COPY freebsd-install-package.sh /
+
 ENV CARGO_TARGET_AARCH64_UNKNOWN_FREEBSD_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc.sh \
     AR_aarch64_unknown_freebsd="$CROSS_TOOLCHAIN_PREFIX"ar \
     CC_aarch64_unknown_freebsd="$CROSS_TOOLCHAIN_PREFIX"gcc \

diff --git a/docker/Dockerfile.i686-unknown-freebsd b/docker/Dockerfile.i686-unknown-freebsd
@@ -21,12 +21,16 @@ 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
 
+COPY freebsd-fetch-best-mirror.sh /
+COPY freebsd-setup-packagesite.sh /
+COPY freebsd-install-package.sh /
+
 ENV CARGO_TARGET_I686_UNKNOWN_FREEBSD_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc.sh \
     AR_i686_unknown_freebsd="$CROSS_TOOLCHAIN_PREFIX"ar \
     CC_i686_unknown_freebsd="$CROSS_TOOLCHAIN_PREFIX"gcc \

diff --git a/docker/Dockerfile.x86_64-unknown-freebsd b/docker/Dockerfile.x86_64-unknown-freebsd
@@ -21,12 +21,16 @@ 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
 
+COPY freebsd-fetch-best-mirror.sh /
+COPY freebsd-setup-packagesite.sh /
+COPY freebsd-install-package.sh /
+
 ENV CARGO_TARGET_X86_64_UNKNOWN_FREEBSD_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc.sh \
     AR_x86_64_unknown_freebsd="$CROSS_TOOLCHAIN_PREFIX"ar \
     CC_x86_64_unknown_freebsd="$CROSS_TOOLCHAIN_PREFIX"gcc \

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
diff --git a/docker/freebsd-fetch-best-mirror.sh b/docker/freebsd-fetch-best-mirror.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+
+# shellcheck disable=SC1091
+. /freebsd-install.sh
+fetch_best_freebsd_mirror "$@"
diff --git a/docker/freebsd-install-package.sh b/docker/freebsd-install-package.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+
+# shellcheck disable=SC1091
+. /freebsd-install.sh
+install_freebsd_package "$@"
diff --git a/docker/freebsd-setup-packagesite.sh b/docker/freebsd-setup-packagesite.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+
+# shellcheck disable=SC1091
+. /freebsd-install.sh
+setup_freebsd_packagesite "$@"
diff --git a/docker/freebsd.sh b/docker/freebsd.sh
@@ -143,7 +143,7 @@ base_release=$(latest_freebsd "${mirror}")
 bsd_url="${mirror}/${FREEBSD_ARCH}/${base_release}-RELEASE"
 
 main() {
-    local binutils=2.32 \
+    local binutils=2.40 \
         gcc=6.4.0 \
         target="${ARCH}-unknown-freebsd${FREEBSD_MAJOR}"
 
@@ -152,6 +152,7 @@ main() {
         g++ \
         make \
         wget \
+        texinfo \
         xz-utils
 
     local td
-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