From 5d39a31bd24588d95ddef9d83c87231aa4b3ff2a Mon Sep 17 00:00:00 2001 From: Adeel Mujahid <3840695+am11@users.noreply.github.com> Date: Sat, 30 Nov 2024 20:15:40 +0200 Subject: [PATCH] Delete EOL'd freebsd 13 --- .../cross/freebsd/{13 => 14}/amd64/Dockerfile | 2 +- .../net10.0/cross/freebsd/14/arm64/Dockerfile | 19 ++++++++ .../cross/freebsd/{13 => 14}/amd64/Dockerfile | 2 +- .../cross/freebsd/{13 => 14}/amd64/Dockerfile | 2 +- .../net9.0/cross/freebsd/14/arm64/Dockerfile | 19 ++++++++ src/azurelinux/manifest.json | 27 ++++++++--- .../2.0/cross/freebsd/13/amd64/Dockerfile | 11 ----- .../2.0/cross/freebsd/13/arm64/Dockerfile | 11 ----- .../2.0/cross/freebsd/14/amd64/Dockerfile | 11 ----- .../2.0/cross/freebsd/14/arm64/Dockerfile | 11 ----- src/cbl-mariner/manifest.json | 48 ------------------- 11 files changed, 61 insertions(+), 102 deletions(-) rename src/azurelinux/3.0/net10.0/cross/freebsd/{13 => 14}/amd64/Dockerfile (91%) create mode 100644 src/azurelinux/3.0/net10.0/cross/freebsd/14/arm64/Dockerfile rename src/azurelinux/3.0/net8.0/cross/freebsd/{13 => 14}/amd64/Dockerfile (91%) rename src/azurelinux/3.0/net9.0/cross/freebsd/{13 => 14}/amd64/Dockerfile (91%) create mode 100644 src/azurelinux/3.0/net9.0/cross/freebsd/14/arm64/Dockerfile delete mode 100644 src/cbl-mariner/2.0/cross/freebsd/13/amd64/Dockerfile delete mode 100644 src/cbl-mariner/2.0/cross/freebsd/13/arm64/Dockerfile delete mode 100644 src/cbl-mariner/2.0/cross/freebsd/14/amd64/Dockerfile delete mode 100644 src/cbl-mariner/2.0/cross/freebsd/14/arm64/Dockerfile diff --git a/src/azurelinux/3.0/net10.0/cross/freebsd/13/amd64/Dockerfile b/src/azurelinux/3.0/net10.0/cross/freebsd/14/amd64/Dockerfile similarity index 91% rename from src/azurelinux/3.0/net10.0/cross/freebsd/13/amd64/Dockerfile rename to src/azurelinux/3.0/net10.0/cross/freebsd/14/amd64/Dockerfile index 3c054806e..3f758ee38 100644 --- a/src/azurelinux/3.0/net10.0/cross/freebsd/13/amd64/Dockerfile +++ b/src/azurelinux/3.0/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 new file mode 100644 index 000000000..5e14fe36d --- /dev/null +++ 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/src/azurelinux/3.0/net8.0/cross/freebsd/13/amd64/Dockerfile b/src/azurelinux/3.0/net8.0/cross/freebsd/14/amd64/Dockerfile similarity index 91% rename from src/azurelinux/3.0/net8.0/cross/freebsd/13/amd64/Dockerfile rename to src/azurelinux/3.0/net8.0/cross/freebsd/14/amd64/Dockerfile index 06e3623cc..52a8ec8ec 100644 --- a/src/azurelinux/3.0/net8.0/cross/freebsd/13/amd64/Dockerfile +++ b/src/azurelinux/3.0/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/src/azurelinux/3.0/net9.0/cross/freebsd/13/amd64/Dockerfile b/src/azurelinux/3.0/net9.0/cross/freebsd/14/amd64/Dockerfile similarity index 91% rename from src/azurelinux/3.0/net9.0/cross/freebsd/13/amd64/Dockerfile rename to src/azurelinux/3.0/net9.0/cross/freebsd/14/amd64/Dockerfile index a92c857b1..e32d4ba4d 100644 --- a/src/azurelinux/3.0/net9.0/cross/freebsd/13/amd64/Dockerfile +++ b/src/azurelinux/3.0/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 new file mode 100644 index 000000000..5e14fe36d --- /dev/null +++ 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 index d0ef1e275..d754d28cc 100644 --- a/src/azurelinux/manifest.json +++ b/src/azurelinux/manifest.json @@ -447,11 +447,11 @@ { "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": {} } } ] @@ -459,12 +459,25 @@ { "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 deleted file mode 100644 index 0e8f86b4c..000000000 --- a/src/cbl-mariner/2.0/cross/freebsd/13/amd64/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -ARG ROOTFS_DIR=/crossrootfs/x64 - -FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-crossdeps-builder AS builder -ARG ROOTFS_DIR - -RUN /scripts/eng/common/cross/build-rootfs.sh freebsd13 x64 - -FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-crossdeps-llvm -ARG ROOTFS_DIR - -COPY --from=builder "$ROOTFS_DIR" "$ROOTFS_DIR" diff --git a/src/cbl-mariner/2.0/cross/freebsd/13/arm64/Dockerfile b/src/cbl-mariner/2.0/cross/freebsd/13/arm64/Dockerfile deleted file mode 100644 index 048e06a4e..000000000 --- a/src/cbl-mariner/2.0/cross/freebsd/13/arm64/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -ARG ROOTFS_DIR=/crossrootfs/arm64 - -FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-crossdeps-builder AS builder -ARG ROOTFS_DIR - -RUN /scripts/eng/common/cross/build-rootfs.sh freebsd13 arm64 - -FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-crossdeps-llvm -ARG ROOTFS_DIR - -COPY --from=builder "$ROOTFS_DIR" "$ROOTFS_DIR" diff --git a/src/cbl-mariner/2.0/cross/freebsd/14/amd64/Dockerfile b/src/cbl-mariner/2.0/cross/freebsd/14/amd64/Dockerfile deleted file mode 100644 index 8d15baaac..000000000 --- a/src/cbl-mariner/2.0/cross/freebsd/14/amd64/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -ARG ROOTFS_DIR=/crossrootfs/x64 - -FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-crossdeps-builder AS builder -ARG ROOTFS_DIR - -RUN /scripts/eng/common/cross/build-rootfs.sh freebsd14 x64 - -FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-crossdeps-llvm -ARG ROOTFS_DIR - -COPY --from=builder "$ROOTFS_DIR" "$ROOTFS_DIR" diff --git a/src/cbl-mariner/2.0/cross/freebsd/14/arm64/Dockerfile b/src/cbl-mariner/2.0/cross/freebsd/14/arm64/Dockerfile deleted file mode 100644 index ca2584db3..000000000 --- a/src/cbl-mariner/2.0/cross/freebsd/14/arm64/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -ARG ROOTFS_DIR=/crossrootfs/arm64 - -FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-crossdeps-builder AS builder -ARG ROOTFS_DIR - -RUN /scripts/eng/common/cross/build-rootfs.sh freebsd14 arm64 - -FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-crossdeps-llvm -ARG ROOTFS_DIR - -COPY --from=builder "$ROOTFS_DIR" "$ROOTFS_DIR" diff --git a/src/cbl-mariner/manifest.json b/src/cbl-mariner/manifest.json index c99787ad6..217c2d123 100644 --- 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": [ {