From a938575f431e65ab7599a9b63d460d5e0a6f7d32 Mon Sep 17 00:00:00 2001 From: Vitaly Chipounov Date: Sun, 3 Mar 2024 19:55:47 +0100 Subject: [PATCH] vagrant: fixed build Signed-off-by: Vitaly Chipounov --- vagrant/Vagrantfile | 2 +- vagrant/provision-root.sh | 6 ++++++ vagrant/provision-user.sh | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile index cec54cf35..46c5f6828 100644 --- a/vagrant/Vagrantfile +++ b/vagrant/Vagrantfile @@ -18,7 +18,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -$boxes = ["debian/bullseye64", "generic/ubuntu2004", "alvistack/ubuntu-22.04"] +$boxes = ["debian/bullseye64", "generic/ubuntu2004", "generic/ubuntu2204"] Vagrant.configure("2") do |config| $boxes.to_enum.with_index(1).each do |box,i| diff --git a/vagrant/provision-root.sh b/vagrant/provision-root.sh index 8034d0a73..ec3f907d4 100755 --- a/vagrant/provision-root.sh +++ b/vagrant/provision-root.sh @@ -35,6 +35,12 @@ fi apt-get -y install git gcc python3 python3-dev python3-venv +# The Ubuntu image doesn't have enough space on the boot partition to install some packages. +# Cleanup unused kernels. +if uname -a | grep -q ubuntu2004; then + apt-get -y remove linux-image-5.4.0-42-generic linux-headers-5.4.0-42-generic linux-modules-5.4.0-42-generic +fi + chown -R vagrant:vagrant /mnt/disk/ su -c "source /vagrant/provision-user.sh" vagrant diff --git a/vagrant/provision-user.sh b/vagrant/provision-user.sh index 167473466..883be0106 100755 --- a/vagrant/provision-user.sh +++ b/vagrant/provision-user.sh @@ -33,7 +33,7 @@ cd s2e-env python3 -m venv venv . venv/bin/activate -pip install --upgrade pip +pip install --upgrade pip wheel pip install .