Merge branch 'master' into deploy

Author: mpe

build/ubuntu/packages.sh

@@ -6,11 +6,9 @@ machine=$(uname -m)
 
 . /etc/os-release
 
-if [[ "$VERSION_ID" == "21.10" ]]; then
-    if [[ "$machine" != "x86_64" ]]; then
-        PACKAGES+=" crossbuild-essential-amd64"
-    fi
+major="${VERSION_ID%%.*}"
 
+if [[ "$major" -ge 21 ]]; then
     PACKAGES+=" clang llvm"
 fi
 
@@ -22,6 +20,11 @@ if [[ "$machine" == "ppc64le" ]]; then
     PACKAGES+=" libhugetlbfs-dev"
     PACKAGES+=" libmnl-dev"
     PACKAGES+=" libmount-dev"
+
+    # For the x86_64 container
+    if [[ "$VERSION_ID" == "21.10" ]]; then
+        PACKAGES+=" crossbuild-essential-amd64"
+    fi
 else
     PACKAGES+=" gcc-powerpc64le-linux-gnu g++-powerpc64le-linux-gnu"
 fi