Skip to content

Commit

Permalink
use different start dir, add patch from PR 3446 for RISC-V
Browse files Browse the repository at this point in the history
  • Loading branch information
bedroge committed Apr 9, 2024
1 parent 25022cd commit 4063226
Showing 1 changed file with 12 additions and 6 deletions.
18 changes: 12 additions & 6 deletions containers/build-or-download-cvmfs-debs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,24 @@ then
cd /tmp
wget https://github.com/cvmfs/cvmfs/archive/refs/tags/cvmfs-${cvmfsversion}.tar.gz
tar xzf cvmfs-${cvmfsversion}.tar.gz
cd cvmfs-cvmfs-${cvmfsversion}/ci/cvmfs
cd cvmfs-cvmfs-${cvmfsversion}
mkdir /root/deb
sed -i 's/Architecture: i386 amd64 armhf arm64/Architecture: i386 amd64 armhf arm64 riscv64/' ../../packaging/debian/cvmfs/control.in
sed -i 's/python-dev/python3-dev/' ../../packaging/debian/cvmfs/control.in
sed -i 's/python-setuptools/python3-setuptools/' ../../packaging/debian/cvmfs/control.in
# valgrind is not available (yet) for RISC-V
sed -i 's/Architecture: i386 amd64 armhf arm64/Architecture: i386 amd64 armhf arm64 riscv64/' packaging/debian/cvmfs/control.in
sed -i 's/python-dev/python3-dev/' packaging/debian/cvmfs/control.in
sed -i 's/python-setuptools/python3-setuptools/' packaging/debian/cvmfs/control.in
if [ "$arch" = "riscv64" ]
then
sed -i 's/, valgrind//' ../../packaging/debian/cvmfs/control.in
# valgrind is not available (yet) for RISC-V
sed -i 's/, valgrind//' packaging/debian/cvmfs/control.in
# for RISC-V we need to run autoreconf, see:
# https://github.com/cvmfs/cvmfs/pull/3446
wget https://github.com/cvmfs/cvmfs/pull/3446.patch
patch -p 1 -i ./3446.patch
rm 3446.patch
else
apt-get install -y valgrind
fi
cd ci/cvmfs
# make sure the cvmfs package also uses debian 13 for debian sid
[ $release = "13" ] && sed -i "s@\$(lsb_release -sr)@13@" ./deb.sh && sed -i "s/focal/trixie/" ./deb.sh
./deb.sh /tmp/cvmfs-cvmfs-${cvmfsversion} /root/deb
Expand Down

0 comments on commit 4063226

Please sign in to comment.