ci/buildroot: allow arch-specific deps, make lld arch-specific

`lld` doesn't exist on s390x. Set things up similarly to how we have it in cosa with our deps by having separate arch-specific dep files.
coreos · Oct 10, 2023 · bb43e8a · bb43e8a
1 parent dd9c4f0
commit bb43e8a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 1 deletion.
diff --git a/ci/buildroot/buildroot-reqs-aarch64.txt b/ci/buildroot/buildroot-reqs-aarch64.txt
@@ -0,0 +1 @@
+lld
diff --git a/ci/buildroot/buildroot-reqs-ppc64le.txt b/ci/buildroot/buildroot-reqs-ppc64le.txt
@@ -0,0 +1 @@
+lld
diff --git a/ci/buildroot/buildroot-reqs-x86_64.txt b/ci/buildroot/buildroot-reqs-x86_64.txt
@@ -0,0 +1 @@
+lld
diff --git a/ci/buildroot/buildroot-reqs.txt b/ci/buildroot/buildroot-reqs.txt
@@ -43,7 +43,7 @@ attr
 gjs
 
 # Also, add clang since it's useful at least in CI for C/C++ projects
-clang lld
+clang
 # And the tools such as clang-format, used for style checking
 clang-tools-extra
 # All C/C++ projects should have CI that uses the sanitizers

diff --git a/ci/buildroot/install-buildroot.sh b/ci/buildroot/install-buildroot.sh
@@ -6,9 +6,15 @@ set -euo pipefail
 dn=$(dirname "$0")
 tmpd=$(mktemp -d) && trap 'rm -rf ${tmpd}' EXIT
 
+arch=$(arch)
+
 echo "Installing base build requirements"
 dnf -y install /usr/bin/xargs 'dnf-command(builddep)'
 deps=$(grep -v '^#' "${dn}"/buildroot-reqs.txt)
+if [ -f "${dn}/buildroot-reqs-${arch}.txt" ]; then
+  deps+=" "
+  deps+=$(grep -v '^#' "${dn}/buildroot-reqs-${arch}.txt")
+fi
 echo "${deps}" | xargs dnf -y install
 
 echo "Installing build dependencies of primary packages"