Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Delete EOL'd freebsd 13 #1272

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 19 additions & 0 deletions src/azurelinux/3.0/net10.0/cross/freebsd/14/arm64/Dockerfile
Original file line number Diff line number Diff line change
@@ -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"
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 19 additions & 0 deletions src/azurelinux/3.0/net9.0/cross/freebsd/14/arm64/Dockerfile
Original file line number Diff line number Diff line change
@@ -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"
27 changes: 20 additions & 7 deletions src/azurelinux/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {}
}
}
]
Expand Down Expand Up @@ -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": {}
}
}
]
Expand Down
11 changes: 0 additions & 11 deletions src/cbl-mariner/2.0/cross/freebsd/13/amd64/Dockerfile
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file was deleted.

11 changes: 0 additions & 11 deletions src/cbl-mariner/2.0/cross/freebsd/13/arm64/Dockerfile

This file was deleted.

11 changes: 0 additions & 11 deletions src/cbl-mariner/2.0/cross/freebsd/14/amd64/Dockerfile

This file was deleted.

11 changes: 0 additions & 11 deletions src/cbl-mariner/2.0/cross/freebsd/14/arm64/Dockerfile

This file was deleted.

48 changes: 0 additions & 48 deletions src/cbl-mariner/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
{
Expand Down
Loading