ubuntu_setup.sh: support 22.04 LTS (#24312)

* Build on 22.04 lts

- Removed python-dev from install_ubuntu_common_requirements()
- Added case ubuntu 22.04
- Added install_ubuntu_21.10_requirements()
- Modified install_ubuntu_latest_requirements() to include python3-dev instead of python-dev

* remove 21.10

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
pull/24326/head
MT 3 years ago committed by GitHub
parent f84fdc86bb
commit 2a64f7b563
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 11
      tools/ubuntu_setup.sh

@ -55,7 +55,6 @@ function install_ubuntu_common_requirements() {
ocl-icd-libopencl1 \ ocl-icd-libopencl1 \
ocl-icd-opencl-dev \ ocl-icd-opencl-dev \
clinfo \ clinfo \
python-dev \
qml-module-qtquick2 \ qml-module-qtquick2 \
qtmultimedia5-dev \ qtmultimedia5-dev \
qtlocation5-dev \ qtlocation5-dev \
@ -68,7 +67,7 @@ function install_ubuntu_common_requirements() {
valgrind valgrind
} }
# Install Ubuntu 21.10 packages # Install Ubuntu 22.04 LTS packages
function install_ubuntu_latest_requirements() { function install_ubuntu_latest_requirements() {
install_ubuntu_common_requirements install_ubuntu_common_requirements
@ -76,7 +75,8 @@ function install_ubuntu_latest_requirements() {
qtbase5-dev \ qtbase5-dev \
qtchooser \ qtchooser \
qt5-qmake \ qt5-qmake \
qtbase5-dev-tools qtbase5-dev-tools \
python3-dev
} }
# Install Ubuntu 20.04 packages # Install Ubuntu 20.04 packages
@ -85,14 +85,15 @@ function install_ubuntu_lts_requirements() {
sudo apt-get install -y --no-install-recommends \ sudo apt-get install -y --no-install-recommends \
libavresample-dev \ libavresample-dev \
qt5-default qt5-default \
python-dev
} }
# Detect OS using /etc/os-release file # Detect OS using /etc/os-release file
if [ -f "/etc/os-release" ]; then if [ -f "/etc/os-release" ]; then
source /etc/os-release source /etc/os-release
case "$ID $VERSION_ID" in case "$ID $VERSION_ID" in
"ubuntu 21.10") "ubuntu 22.04")
install_ubuntu_latest_requirements install_ubuntu_latest_requirements
;; ;;
"ubuntu 20.04") "ubuntu 20.04")

Loading…
Cancel
Save