Delete EOL'd freebsd 13

dotnet · Nov 30, 2024 · 5d39a31 · 5d39a31
1 parent c2090d3
commit 5d39a31
Show file tree

Hide file tree

Showing 11 changed files with 61 additions and 102 deletions.
diff --git a/...net10.0/cross/freebsd/13/amd64/Dockerfile → ...net10.0/cross/freebsd/14/amd64/Dockerfile b/...net10.0/cross/freebsd/13/amd64/Dockerfile → ...net10.0/cross/freebsd/14/amd64/Dockerfile
@@ -11,7 +11,7 @@ RUN tdnf install -y \
     # so the FreeBSD bootstrap can find it. See https://github.com/microsoft/azurelinux/issues/9217
     ln -s /usr/lib/liblzma.so.5 /usr/lib/liblzma.so
 
-RUN /scripts/eng/common/cross/build-rootfs.sh freebsd13 x64
+RUN /scripts/eng/common/cross/build-rootfs.sh freebsd14 x64
 
 FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm-amd64
 ARG ROOTFS_DIR

diff --git a/src/azurelinux/3.0/net10.0/cross/freebsd/14/arm64/Dockerfile b/src/azurelinux/3.0/net10.0/cross/freebsd/14/arm64/Dockerfile
@@ -0,0 +1,19 @@
+ARG ROOTFS_DIR=/crossrootfs/arm64
+
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-crossdeps-builder-amd64 AS builder
+ARG ROOTFS_DIR
+
+# Install packages needed by the FreeBSD bootstrap scripts
+RUN tdnf install -y \
+    awk \
+    m4 && \
+    # The xz package in Azure Linux 3.0 doesn't provide liblzma.so, so we need to create a symlink to liblzma.so.5
+    # so the FreeBSD bootstrap can find it. See https://github.com/microsoft/azurelinux/issues/9217
+    ln -s /usr/lib/liblzma.so.5 /usr/lib/liblzma.so
+
+RUN /scripts/eng/common/cross/build-rootfs.sh freebsd14 arm64
+
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-crossdeps-llvm-amd64
+ARG ROOTFS_DIR
+
+COPY --from=builder "$ROOTFS_DIR" "$ROOTFS_DIR"
diff --git a/.../net8.0/cross/freebsd/13/amd64/Dockerfile → .../net8.0/cross/freebsd/14/amd64/Dockerfile b/.../net8.0/cross/freebsd/13/amd64/Dockerfile → .../net8.0/cross/freebsd/14/amd64/Dockerfile
@@ -11,7 +11,7 @@ RUN tdnf install -y \
     # so the FreeBSD bootstrap can find it. See https://github.com/microsoft/azurelinux/issues/9217
     ln -s /usr/lib/liblzma.so.5 /usr/lib/liblzma.so
 
-RUN /scripts/eng/common/cross/build-rootfs.sh freebsd13 x64
+RUN /scripts/eng/common/cross/build-rootfs.sh freebsd14 x64
 
 FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-crossdeps-llvm-amd64
 ARG ROOTFS_DIR

diff --git a/.../net9.0/cross/freebsd/13/amd64/Dockerfile → .../net9.0/cross/freebsd/14/amd64/Dockerfile b/.../net9.0/cross/freebsd/13/amd64/Dockerfile → .../net9.0/cross/freebsd/14/amd64/Dockerfile
@@ -11,7 +11,7 @@ RUN tdnf install -y \
     # so the FreeBSD bootstrap can find it. See https://github.com/microsoft/azurelinux/issues/9217
     ln -s /usr/lib/liblzma.so.5 /usr/lib/liblzma.so
 
-RUN /scripts/eng/common/cross/build-rootfs.sh freebsd13 x64
+RUN /scripts/eng/common/cross/build-rootfs.sh freebsd14 x64
 
 FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-crossdeps-llvm-amd64
 ARG ROOTFS_DIR

diff --git a/src/azurelinux/3.0/net9.0/cross/freebsd/14/arm64/Dockerfile b/src/azurelinux/3.0/net9.0/cross/freebsd/14/arm64/Dockerfile
@@ -0,0 +1,19 @@
+ARG ROOTFS_DIR=/crossrootfs/arm64
+
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-crossdeps-builder-amd64 AS builder
+ARG ROOTFS_DIR
+
+# Install packages needed by the FreeBSD bootstrap scripts
+RUN tdnf install -y \
+    awk \
+    m4 && \
+    # The xz package in Azure Linux 3.0 doesn't provide liblzma.so, so we need to create a symlink to liblzma.so.5
+    # so the FreeBSD bootstrap can find it. See https://github.com/microsoft/azurelinux/issues/9217
+    ln -s /usr/lib/liblzma.so.5 /usr/lib/liblzma.so
+
+RUN /scripts/eng/common/cross/build-rootfs.sh freebsd14 arm64
+
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-crossdeps-llvm-amd64
+ARG ROOTFS_DIR
+
+COPY --from=builder "$ROOTFS_DIR" "$ROOTFS_DIR"
diff --git a/src/azurelinux/manifest.json b/src/azurelinux/manifest.json
@@ -447,24 +447,37 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net8.0/cross/freebsd/13/amd64",
+              "dockerfile": "src/azurelinux/3.0/net8.0/cross/freebsd/14/amd64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net8.0-cross-freebsd-13-amd64": {}
+                "azurelinux-3.0-net8.0-cross-freebsd-14-amd64": {}
               }
             }
           ]
         },
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net9.0/cross/freebsd/13/amd64",
+              "dockerfile": "src/azurelinux/3.0/net9.0/cross/freebsd/14/amd64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net9.0-cross-freebsd-13": {},
-                "azurelinux-3.0-net9.0-cross-freebsd-13-amd64": {}
+                "azurelinux-3.0-net9.0-cross-freebsd-14": {},
+                "azurelinux-3.0-net9.0-cross-freebsd-14-amd64": {}
+              }
+            }
+          ]
+        },
+        {
+          "platforms": [
+            {
+              "dockerfile": "src/azurelinux/3.0/net9.0/cross/freebsd/14/arm64",
+              "os": "linux",
+              "osVersion": "azurelinux3.0",
+              "tags": {
+                "azurelinux-3.0-net9.0-cross-freebsd-14": {},
+                "azurelinux-3.0-net9.0-cross-freebsd-14-arm64": {}
               }
             }
           ]
@@ -773,11 +786,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net10.0/cross/freebsd/13/amd64",
+              "dockerfile": "src/azurelinux/3.0/net10.0/cross/freebsd/14/amd64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net10.0-cross-freebsd-13-amd64": {}
+                "azurelinux-3.0-net10.0-cross-freebsd-14-amd64": {}
               }
             }
           ]

diff --git a/src/cbl-mariner/2.0/cross/freebsd/13/amd64/Dockerfile b/src/cbl-mariner/2.0/cross/freebsd/13/amd64/Dockerfile
diff --git a/src/cbl-mariner/2.0/cross/freebsd/13/arm64/Dockerfile b/src/cbl-mariner/2.0/cross/freebsd/13/arm64/Dockerfile
diff --git a/src/cbl-mariner/2.0/cross/freebsd/14/amd64/Dockerfile b/src/cbl-mariner/2.0/cross/freebsd/14/amd64/Dockerfile
diff --git a/src/cbl-mariner/2.0/cross/freebsd/14/arm64/Dockerfile b/src/cbl-mariner/2.0/cross/freebsd/14/arm64/Dockerfile
diff --git a/src/cbl-mariner/manifest.json b/src/cbl-mariner/manifest.json
@@ -365,54 +365,6 @@
             }
           ]
         },
-        {
-          "platforms": [
-            {
-              "dockerfile": "src/cbl-mariner/2.0/cross/freebsd/13/amd64",
-              "os": "linux",
-              "osVersion": "cbl-mariner2.0",
-              "tags": {
-                "cbl-mariner-2.0-cross-amd64-freebsd-13": {}
-              }
-            }
-          ]
-        },
-        {
-          "platforms": [
-            {
-              "dockerfile": "src/cbl-mariner/2.0/cross/freebsd/13/arm64",
-              "os": "linux",
-              "osVersion": "cbl-mariner2.0",
-              "tags": {
-                "cbl-mariner-2.0-cross-arm64-freebsd-13": {}
-              }
-            }
-          ]
-        },
-        {
-          "platforms": [
-            {
-              "dockerfile": "src/cbl-mariner/2.0/cross/freebsd/14/amd64",
-              "os": "linux",
-              "osVersion": "cbl-mariner2.0",
-              "tags": {
-                "cbl-mariner-2.0-cross-amd64-freebsd-14": {}
-              }
-            }
-          ]
-        },
-        {
-          "platforms": [
-            {
-              "dockerfile": "src/cbl-mariner/2.0/cross/freebsd/14/arm64",
-              "os": "linux",
-              "osVersion": "cbl-mariner2.0",
-              "tags": {
-                "cbl-mariner-2.0-cross-arm64-freebsd-14": {}
-              }
-            }
-          ]
-        },
         {
           "platforms": [
             {