Move linux-riscv64 and haiku-x64 to 22.04

src/ubuntu/20.04/crossdeps/Dockerfile

@@ -14,16 +14,13 @@ RUN apt-get update \
     && apt-get install -y \
         binfmt-support \
         binutils-arm-linux-gnueabihf \
-        bison \
-        bisonc++ \
         build-essential \
         cmake \
         cpio \
         debootstrap \
         flex \
         gdb \
         make \
-        nasm \
         qemu \
         qemu-user-static \
         rpm2cpio \
@@ -34,7 +31,6 @@ RUN apt-get update \
         libbsd-dev \
         libmpc-dev \
         libxml2-utils \
-        libzstd-dev \
     && rm -rf /var/lib/apt/lists/*
 
 RUN apt-get update \

src/ubuntu/22.04/coredeps/Dockerfile

@@ -0,0 +1,35 @@
+FROM mcr.microsoft.com/powershell:7.2-ubuntu-22.04
+
+# Install tools used by the VSO build automation.
+RUN apt-get update \
+    && apt-get install -y \
+        git \
+        nodejs \
+        npm \
+        tar \
+        zip \
+    && rm -rf /var/lib/apt/lists/* \
+    && npm install -g [email protected] \
+    && npm cache clean --force
+
+# Runtime dependencies
+RUN apt-get update \
+    && apt-get install -y \
+        autoconf \
+        automake \
+        build-essential \
+        gettext \
+        jq \
+        libcurl4-openssl-dev \
+        libgdiplus \
+        libicu-dev \
+        libkrb5-dev \
+        liblttng-ust-dev \
+        libnuma-dev \
+        libssl-dev \
+        libtool \
+        libunwind8 \
+        libunwind8-dev \
+        python3 \
+        uuid-dev \
+    && rm -rf /var/lib/apt/lists/*

src/ubuntu/22.04/cross/haiku/Dockerfile

@@ -0,0 +1,3 @@
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-crossdeps
+
+ADD rootfs.x64.tar crossrootfs

src/ubuntu/20.04/cross/haiku/hooks/pre-build → src/ubuntu/22.04/cross/haiku/hooks/pre-build

@@ -2,4 +2,4 @@
 
 SCRIPT=$(readlink -f "$0")
 SCRIPTPATH=$(dirname "$SCRIPT")
-$SCRIPTPATH/../../../../build-scripts/build-rootfs.sh ubuntu-20.04 haiku x64 "" /rootfs/x64/boot/system/bin
+$SCRIPTPATH/../../../../build-scripts/build-rootfs.sh ubuntu-22.04 haiku x64 "" /rootfs/x64/boot/system/bin

src/ubuntu/22.04/cross/riscv64/Dockerfile

@@ -0,0 +1,3 @@
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-crossdeps
+
+ADD rootfs.riscv64.tar crossrootfs

src/ubuntu/22.04/cross/riscv64/hooks/pre-build

@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+
+SCRIPT=$(readlink -f "$0")
+SCRIPTPATH=$(dirname "$SCRIPT")
+$SCRIPTPATH/../../../../build-scripts/build-rootfs.sh ubuntu-22.04 jammy riscv64

src/ubuntu/22.04/crossdeps/Dockerfile

@@ -0,0 +1,49 @@
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-coredeps
+
+# Install the base toolchain we need to build anything (clang, cmake, make and the like).
+RUN apt-get update \
+    && apt-get install -y \
+        apt-transport-https \
+        ca-certificates \
+        gnupg \
+        software-properties-common \
+        wget \
+    && wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc | apt-key add - \
+    && apt-add-repository 'deb https://apt.kitware.com/ubuntu/ jammy main' \
+    && apt-get update \
+    && apt-get install -y \
+        binfmt-support \
+        binutils-arm-linux-gnueabihf \
+        bison \
+        bisonc++ \
+        build-essential \
+        cmake \
+        cpio \
+        debootstrap \
+        flex \
+        gdb \
+        make \
+        nasm \
+        qemu \
+        qemu-user-static \
+        rpm2cpio \
+        libbz2-dev \
+        libz-dev \
+        liblzma-dev \
+        libarchive-dev \
+        libbsd-dev \
+        libmpc-dev \
+        libxml2-utils \
+        libzstd-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+# install llvm-toolchain v15 using official script
+RUN wget -O- https://apt.llvm.org/llvm.sh | bash -s -- 15 \
+        clang \
+        clang-tools \
+        liblldb-dev \
+        lld \
+        lldb \
+        llvm \
+        python3-lldb \
+    && rm -rf /var/lib/apt/lists/*

src/ubuntu/manifest.json

@@ -675,23 +675,28 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/ubuntu/20.04/cross/riscv64",
+              "architecture": "amd64",
+              "dockerfile": "src/ubuntu/20.04/crossdac/amd64",
               "os": "linux",
               "osVersion": "focal",
               "tags": {
-                "ubuntu-20.04-cross-riscv64-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {}
+                "ubuntu-20.04-crossdac-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {}
               }
             }
           ]
         },
         {
           "platforms": [
             {
-              "dockerfile": "src/ubuntu/20.04/cross/haiku",
+              "architecture": "amd64",
+              "dockerfile": "src/ubuntu/20.04/helix/amd64",
               "os": "linux",
               "osVersion": "focal",
               "tags": {
-                "ubuntu-20.04-cross-haiku-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {}
+                "ubuntu-20.04-helix-amd64-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
+                "ubuntu-20.04-helix-amd64": {
+                  "isLocal": true
+                }
               }
             }
           ]
@@ -700,25 +705,24 @@
           "platforms": [
             {
               "architecture": "amd64",
-              "dockerfile": "src/ubuntu/20.04/crossdac/amd64",
+              "dockerfile": "src/ubuntu/20.04/helix/wasm/amd64",
               "os": "linux",
               "osVersion": "focal",
               "tags": {
-                "ubuntu-20.04-crossdac-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {}
+                "ubuntu-20.04-helix-wasm-amd64-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {}
               }
             }
           ]
         },
         {
           "platforms": [
             {
-              "architecture": "amd64",
-              "dockerfile": "src/ubuntu/20.04/helix/amd64",
+              "dockerfile": "src/ubuntu/20.04/amd64",
               "os": "linux",
               "osVersion": "focal",
               "tags": {
-                "ubuntu-20.04-helix-amd64-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
-                "ubuntu-20.04-helix-amd64": {
+                "ubuntu-20.04-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
+                "ubuntu-20.04": {
                   "isLocal": true
                 }
               }
@@ -728,25 +732,27 @@
         {
           "platforms": [
             {
-              "architecture": "amd64",
-              "dockerfile": "src/ubuntu/20.04/helix/wasm/amd64",
+              "dockerfile": "src/ubuntu/22.04/amd64",
               "os": "linux",
-              "osVersion": "focal",
+              "osVersion": "jammy",
               "tags": {
-                "ubuntu-20.04-helix-wasm-amd64-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {}
+                "ubuntu-22.04-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
+                "ubuntu-22.04": {
+                  "isLocal": true
+                }
               }
             }
           ]
         },
         {
           "platforms": [
             {
-              "dockerfile": "src/ubuntu/20.04/amd64",
+              "dockerfile": "src/ubuntu/22.04/coredeps",
               "os": "linux",
-              "osVersion": "focal",
+              "osVersion": "jammy",
               "tags": {
-                "ubuntu-20.04-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
-                "ubuntu-20.04": {
+                "ubuntu-22.04-coredeps-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
+                "ubuntu-22.04-coredeps": {
                   "isLocal": true
                 }
               }
@@ -756,18 +762,42 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/ubuntu/22.04/amd64",
+              "dockerfile": "src/ubuntu/22.04/crossdeps",
               "os": "linux",
               "osVersion": "jammy",
               "tags": {
-                "ubuntu-22.04-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
-                "ubuntu-22.04": {
+                "ubuntu-22.04-crossdeps-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
+                "ubuntu-22.04-crossdeps": {
                   "isLocal": true
                 }
               }
             }
           ]
         },
+        {
+          "platforms": [
+            {
+              "dockerfile": "src/ubuntu/22.04/cross/riscv64",
+              "os": "linux",
+              "osVersion": "jammy",
+              "tags": {
+                "ubuntu-22.04-cross-riscv64-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {}
+              }
+            }
+          ]
+        },
+        {
+          "platforms": [
+            {
+              "dockerfile": "src/ubuntu/22.04/cross/haiku",
+              "os": "linux",
+              "osVersion": "jammy",
+              "tags": {
+                "ubuntu-22.04-cross-haiku-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {}
+              }
+            }
+          ]
+        },
         {
           "platforms": [
             {