From a5b1e959bee6becaf8e0bc28e7fbdda4c7774498 Mon Sep 17 00:00:00 2001 From: Vojtech Trefny Date: Tue, 30 Sep 2025 13:38:43 +0200 Subject: [PATCH 1/2] misc: Remove custom Vagrantfile The original idea was to use this for testing and development but we never really did that and keeps getting out of date every 6 months. --- misc/Vagrantfile | 65 ------------------------------------------------ 1 file changed, 65 deletions(-) delete mode 100644 misc/Vagrantfile diff --git a/misc/Vagrantfile b/misc/Vagrantfile deleted file mode 100644 index 3c334572a..000000000 --- a/misc/Vagrantfile +++ /dev/null @@ -1,65 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -# -# A Vagrantfile template that can be used for creating machines for libblockdev -# development/testing. -# -# Use 'vagrant up && vagrant ssh' to spawn the default machine (most recent -# Fedora) and ssh into it or e.g. 'vagrant up bd-f29 && vagrant ssh bd-f29' to -# use a Fedora 29 based machine, etc. -# - -def os_cpu_cores - case RbConfig::CONFIG['host_os'] - when /darwin/ - Integer(`sysctl -n hw.ncpu`) - when /linux/ - Integer(`getconf _NPROCESSORS_ONLN`) - else - raise StandardError, "Unsupported platform" - end -end - -Vagrant.configure("2") do |config| - # common configuration - - config.vm.synced_folder "../", "/home/vagrant/libblockdev/", - type: "rsync", rsync__args: ["-a", "-l", "--exclude=misc"] # override the default args - - # CHECK THAT THE BELOW OPTIONS ARE OKAY FOR YOUR HW - config.vm.provider :libvirt do |v| - v.memory = "2048" - v.cpus = os_cpu_cores - v.disk_driver :cache => "unsafe" - end - - # just some handy stuff to have in shell OOTB - config.vm.provision :shell, inline: <<-SHELL - echo 'alias make="make -j -l4"' >> /home/vagrant/.bashrc - echo 'cd libblockdev' >> /home/vagrant/.bash_history - echo './autogen.sh && ./configure' >> /home/vagrant/.bash_history - SHELL - - # install all test dependencies using ansible - config.vm.provision "ansible" do |ansible| - ansible.playbook = "install-test-dependencies.yml" - ansible.extra_vars = { ansible_python_interpreter:"/usr/bin/python3" } - end - - config.vm.define "bd-f40", primary: true, autostart: true do |f40| - f40.vm.box = "fedora/40-cloud-base" - end - - config.vm.define "bd-f39", primary: false, autostart: false do |f39| - f39.vm.box = "fedora/39-cloud-base" - end - - config.vm.define "bd-u2404", primary: false, autostart: false do |u2404| - u2404.vm.box = "generic/ubuntu2404" - end - - config.vm.define "bd-debiant", primary: false, autostart: false do |debiant| - debiant.vm.box = "debian/testing64" - end -end From 55a63b2cb4dce0721df98976d3ed5d6e206942dc Mon Sep 17 00:00:00 2001 From: Vojtech Trefny Date: Tue, 30 Sep 2025 14:35:45 +0200 Subject: [PATCH 2/2] misc: Add some missing dependencies for pgi-docgen --- misc/PythonDocs.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/PythonDocs.Dockerfile b/misc/PythonDocs.Dockerfile index 92379cad8..63b3361e8 100644 --- a/misc/PythonDocs.Dockerfile +++ b/misc/PythonDocs.Dockerfile @@ -9,7 +9,7 @@ RUN echo "deb-src http://deb.debian.org/debian testing main" >> /etc/apt/sources RUN apt-get update # pgi-docgen dependencies -RUN apt-get -y install python3 python3-pip python3-jinja2 python3-sphinx python3-bs4 python3-graphviz libgirepository-1.0-1 gir1.2-glib-2.0 +RUN apt-get -y install python3 python3-pip python3-jinja2 python3-sphinx python3-bs4 python3-graphviz libgirepository-1.0-1 libgirepository1.0-dev gir1.2-glib-2.0 gir1.2-glib-2.0-dev RUN apt-get -y install git