From 18a8baf8e2b8b311b45b13e1c0a5ab8218af4bdc Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sun, 2 Jun 2024 19:23:49 +0200 Subject: [PATCH] revive the buster64 box RHEL8 and clones are on this glibc version. --- Vagrantfile | 18 ++++++++++++++++++ scripts/fetch-binaries | 1 + 2 files changed, 19 insertions(+) diff --git a/Vagrantfile b/Vagrantfile index b72efb050b..6a0b98cdb8 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -19,6 +19,8 @@ def packages_debianoid(user) apt install -y libfuse-dev fuse || true apt install -y libfuse3-dev fuse3 || true apt install -y locales || true + # we need to give the prefix to support debian buster (no libxxhash.pc for pkg-config there): + echo 'export BORG_LIBXXHASH_PREFIX=/usr' >> ~vagrant/.bash_profile sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen usermod -a -G fuse #{user} chgrp fuse /dev/fuse @@ -329,6 +331,22 @@ Vagrant.configure(2) do |config| b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("bullseye64", ".*none.*") end + config.vm.define "buster64" do |b| + b.vm.box = "debian/buster64" + b.vm.provider :virtualbox do |v| + v.memory = 1024 + $wmem + end + b.vm.provision "fs init", :type => :shell, :inline => fs_init("vagrant") + b.vm.provision "packages debianoid", :type => :shell, :inline => packages_debianoid("vagrant") + b.vm.provision "install pyenv", :type => :shell, :privileged => false, :inline => install_pyenv("buster64") + b.vm.provision "install pythons", :type => :shell, :privileged => false, :inline => install_pythons("buster64") + b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_pyenv_venv("buster64") + b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg("llfuse") + b.vm.provision "install pyinstaller", :type => :shell, :privileged => false, :inline => install_pyinstaller() + b.vm.provision "build binary with pyinstaller", :type => :shell, :privileged => false, :inline => build_binary_with_pyinstaller("buster64") + b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("buster64", ".*none.*") + end + config.vm.define "freebsd64" do |b| b.vm.box = "generic/freebsd14" b.vm.provider :virtualbox do |v| diff --git a/scripts/fetch-binaries b/scripts/fetch-binaries index 942fc3608d..a43448d14e 100755 --- a/scripts/fetch-binaries +++ b/scripts/fetch-binaries @@ -12,6 +12,7 @@ check_and_copy () { echo "" } +check_and_copy buster64 borg-linux-glibc228 check_and_copy bullseye64 borg-linux-glibc231 check_and_copy bookworm64 borg-linux-glibc236