From 42aa1d6d3f326a7dc0c188394c61370f00c97bf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 12 Apr 2024 10:09:08 +0200 Subject: [PATCH] use uname -m for cpu detection on risc-v --- containers/build-or-download-cvmfs-debs.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/containers/build-or-download-cvmfs-debs.sh b/containers/build-or-download-cvmfs-debs.sh index e680e1b5..cd81bee9 100644 --- a/containers/build-or-download-cvmfs-debs.sh +++ b/containers/build-or-download-cvmfs-debs.sh @@ -36,6 +36,11 @@ then wget https://github.com/cvmfs/cvmfs/pull/3446.patch patch -p 1 -i ./3446.patch rm 3446.patch + # QEMU shows the host CPU in /proc/cpuinfo, so we need to tweak the CPU detection for some packages and use uname -m instead + sed -i "s/^ISA=.*/ISA=\$(uname -m)/" externals/libcrypto/src/configureHook.sh + sed -i "s/rv64/riscv64/" externals/libcrypto/src/configureHook.sh + sed -i "s/^ISA=.*/ISA=\$(uname -m)/" externals/protobuf/src/configureHook.sh + sed -i "s/rv64/riscv64/" externals/protobuf/src/configureHook.sh else apt-get install -y valgrind fi