Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tools: make hirsute and impish support EOL for env install and vagrant.

This commit is contained in:
Pierre Kancir 2022-08-26 00:00:53 +02:00 committed by Andrew Tridgell
parent f28f5a1ad5
commit b6a5eb064c
2 changed files with 39 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Tools/environment_install/install-prereqs-ubuntu.sh
View File

@ -83,9 +83,7 @@ elif [ ${RELEASE_CODENAME} == 'jammy' ]; then
PYTHON_V="python3" PYTHON_V="python3"
PIP=pip3 PIP=pip3
elif [ ${RELEASE_CODENAME} == 'groovy' ] || elif [ ${RELEASE_CODENAME} == 'groovy' ] ||
[ ${RELEASE_CODENAME} == 'hirsute' ] || [ ${RELEASE_CODENAME} == 'bullseye' ]; then
[ ${RELEASE_CODENAME} == 'bullseye' ] ||
[ ${RELEASE_CODENAME} == 'impish' ]; then
SITLFML_VERSION="2.5" SITLFML_VERSION="2.5"
SITLCFML_VERSION="2.5" SITLCFML_VERSION="2.5"
PYTHON_V="python3" PYTHON_V="python3"
@ -226,10 +224,8 @@ then
BASE_PKGS+=" python-is-python3" BASE_PKGS+=" python-is-python3"
SITL_PKGS+=" libpython3-stdlib" # for argparse SITL_PKGS+=" libpython3-stdlib" # for argparse
elif [ ${RELEASE_CODENAME} == 'groovy' ] || elif [ ${RELEASE_CODENAME} == 'groovy' ] ||
[ ${RELEASE_CODENAME} == 'hirsute' ] ||
[ ${RELEASE_CODENAME} == 'bullseye' ] || [ ${RELEASE_CODENAME} == 'bullseye' ] ||
[ ${RELEASE_CODENAME} == 'jammy' ] || [ ${RELEASE_CODENAME} == 'jammy' ]; then
[ ${RELEASE_CODENAME} == 'impish' ]; then
BASE_PKGS+=" python-is-python3" BASE_PKGS+=" python-is-python3"
SITL_PKGS+=" libpython3-stdlib" # for argparse SITL_PKGS+=" libpython3-stdlib" # for argparse
else else
@ -241,7 +237,6 @@ if [[ $SKIP_AP_GRAPHIC_ENV -ne 1 ]]; then
if [ ${RELEASE_CODENAME} == 'bullseye' ]; then if [ ${RELEASE_CODENAME} == 'bullseye' ]; then
SITL_PKGS+=" libjpeg62-turbo-dev" SITL_PKGS+=" libjpeg62-turbo-dev"
elif [ ${RELEASE_CODENAME} == 'groovy' ] || elif [ ${RELEASE_CODENAME} == 'groovy' ] ||
[ ${RELEASE_CODENAME} == 'hirsute' ] ||
[ ${RELEASE_CODENAME} == 'focal' ] || [ ${RELEASE_CODENAME} == 'focal' ] ||
[ ${RELEASE_CODENAME} == 'ulyssa' ]; then [ ${RELEASE_CODENAME} == 'ulyssa' ]; then
SITL_PKGS+=" libjpeg8-dev" SITL_PKGS+=" libjpeg8-dev"
@ -257,11 +252,9 @@ if [[ $SKIP_AP_GRAPHIC_ENV -ne 1 ]]; then
fi fi
if [ ${RELEASE_CODENAME} == 'bullseye' ] || if [ ${RELEASE_CODENAME} == 'bullseye' ] ||
[ ${RELEASE_CODENAME} == 'groovy' ] || [ ${RELEASE_CODENAME} == 'groovy' ] ||
[ ${RELEASE_CODENAME} == 'hirsute' ] ||
[ ${RELEASE_CODENAME} == 'focal' ] || [ ${RELEASE_CODENAME} == 'focal' ] ||
[ ${RELEASE_CODENAME} == 'ulyssa' ] || [ ${RELEASE_CODENAME} == 'ulyssa' ] ||
[ ${RELEASE_CODENAME} == 'jammy' ] || [ ${RELEASE_CODENAME} == 'jammy' ]; then
[ ${RELEASE_CODENAME} == 'impish' ]; then
SITL_PKGS+=" python3-wxgtk4.0" SITL_PKGS+=" python3-wxgtk4.0"
SITL_PKGS+=" fonts-freefont-ttf libfreetype6-dev libpng16-16 libportmidi-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev libsdl1.2-dev" # for pygame SITL_PKGS+=" fonts-freefont-ttf libfreetype6-dev libpng16-16 libportmidi-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev libsdl1.2-dev" # for pygame
fi fi

72
Vagrantfile vendored
View File

@ -188,44 +188,44 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
focal.vm.boot_timeout = 1500 focal.vm.boot_timeout = 1500
end end
# 20.10 # 20.10 EOL July 2021
config.vm.define "groovy", autostart: false do |groovy| # config.vm.define "groovy", autostart: false do |groovy|
groovy.vm.box = "ubuntu/groovy64" # groovy.vm.box = "ubuntu/groovy64"
groovy.vm.provision :shell, path: "Tools/vagrant/initvagrant.sh" # groovy.vm.provision :shell, path: "Tools/vagrant/initvagrant.sh"
groovy.vm.provider "virtualbox" do |vb| # groovy.vm.provider "virtualbox" do |vb|
vb.name = "ArduPilot (groovy)" # vb.name = "ArduPilot (groovy)"
end # end
groovy.vm.boot_timeout = 1200 # groovy.vm.boot_timeout = 1200
end # end
# 21.04 # 21.04 EOL January 2022 apt repo down
config.vm.define "hirsute", autostart: false do |hirsute| # config.vm.define "hirsute", autostart: false do |hirsute|
hirsute.vm.box = "ubuntu/hirsute64" # hirsute.vm.box = "ubuntu/hirsute64"
hirsute.vm.provision :shell, path: "Tools/vagrant/initvagrant.sh" # hirsute.vm.provision :shell, path: "Tools/vagrant/initvagrant.sh"
hirsute.vm.provider "virtualbox" do |vb| # hirsute.vm.provider "virtualbox" do |vb|
vb.name = "ArduPilot (hirsute)" # vb.name = "ArduPilot (hirsute)"
end # end
hirsute.vm.boot_timeout = 1200 # hirsute.vm.boot_timeout = 1200
end # end
config.vm.define "hirsute-desktop", autostart: false do |hirsute| # config.vm.define "hirsute-desktop", autostart: false do |hirsute|
hirsute.vm.box = "ubuntu/hirsute64" # hirsute.vm.box = "ubuntu/hirsute64"
hirsute.vm.provision :shell, path: "Tools/vagrant/initvagrant-desktop.sh" # hirsute.vm.provision :shell, path: "Tools/vagrant/initvagrant-desktop.sh"
hirsute.vm.provider "virtualbox" do |vb| # hirsute.vm.provider "virtualbox" do |vb|
vb.name = "ArduPilot (hirsute-desktop)" # vb.name = "ArduPilot (hirsute-desktop)"
vb.gui = true # vb.gui = true
end # end
hirsute.vm.boot_timeout = 1200 # hirsute.vm.boot_timeout = 1200
end # end
# 21.10 # 21.10 EOL July 2022
config.vm.define "impish", autostart: false do |impish| # config.vm.define "impish", autostart: false do |impish|
impish.vm.box = "ubuntu/impish64" # impish.vm.box = "ubuntu/impish64"
impish.vm.provision :shell, path: "Tools/vagrant/initvagrant.sh" # impish.vm.provision :shell, path: "Tools/vagrant/initvagrant.sh"
impish.vm.provider "virtualbox" do |vb| # impish.vm.provider "virtualbox" do |vb|
vb.name = "ArduPilot (impish)" # vb.name = "ArduPilot (impish)"
end # end
impish.vm.boot_timeout = 1200 # impish.vm.boot_timeout = 1200
end # end
# 22.04 LTS EOL Apr 2032 # 22.04 LTS EOL Apr 2032
config.vm.define "jammy", autostart: false do |jammy| config.vm.define "jammy", autostart: false do |jammy|