mirror of
https://github.com/ArduPilot/ardupilot.git
synced 2026-10-02 10:23:25 +08:00
Tools: Vagrant: add support for resolute
Vagrant: compile wxpython in home for resolute and future releases switch to excluding older versions to avoid needing to change this when making new releases
This commit is contained in:
committed by
Peter Barker
parent
4965c4e84a
commit
9f648ccabc
@@ -39,9 +39,8 @@ fi
|
||||
|
||||
DASHDASHLOGIN=""
|
||||
if false ||
|
||||
[ ${DISTRIBUTION_CODENAME} == 'oracular' ] ||
|
||||
[ ${DISTRIBUTION_CODENAME} == 'plucky' ] ||
|
||||
[ ${DISTRIBUTION_CODENAME} == 'questing' ] ||
|
||||
[ ${DISTRIBUTION_CODENAME} != 'jammy' ] &&
|
||||
[ ${DISTRIBUTION_CODENAME} != 'noble' ] ||
|
||||
false; then
|
||||
# we run out of space in tmpfs /tmp while compiling wxpython, so
|
||||
# do it elsewhere:
|
||||
@@ -64,6 +63,9 @@ apt-get install -y valgrind
|
||||
# gdb support:
|
||||
apt-get install -y gdb
|
||||
|
||||
# X forwarding support; resolute started to need this
|
||||
apt-get install -y xauth
|
||||
|
||||
sudo -u $VAGRANT_USER ln -fs /vagrant/Tools/vagrant/screenrc /home/$VAGRANT_USER/.screenrc
|
||||
|
||||
# enable permissive ptrace:
|
||||
|
||||
Vendored
+21
@@ -143,4 +143,25 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
|
||||
end
|
||||
questing.vm.boot_timeout = 1200
|
||||
end
|
||||
|
||||
# 26.04 LTS EOL Jul 2031
|
||||
# note the use of "bento" here; Ubuntu stopped providing Vagrant
|
||||
# images due to Hashicorp adopting the "Business Source License".
|
||||
config.vm.define "resolute", autostart: false do |resolute|
|
||||
resolute.vm.box = "bento/ubuntu-26.04"
|
||||
resolute.vm.provision :shell, path: "Tools/vagrant/initvagrant.sh"
|
||||
resolute.vm.provider "virtualbox" do |vb|
|
||||
vb.name = "ArduPilot (resolute)"
|
||||
end
|
||||
resolute.vm.boot_timeout = 1200
|
||||
end
|
||||
config.vm.define "resolute-desktop", autostart: false do |resolute|
|
||||
resolute.vm.box = "bento/ubuntu-26.04"
|
||||
resolute.vm.provision :shell, path: "Tools/vagrant/initvagrant-desktop.sh"
|
||||
resolute.vm.provider "virtualbox" do |vb|
|
||||
vb.name = "ArduPilot (resolute-desktop)"
|
||||
vb.gui = true
|
||||
end
|
||||
resolute.vm.boot_timeout = 1200
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user