From da55c4c620484f77d6d5942510cd1d3f0dbf596e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Wed, 18 Sep 2024 08:31:36 +0300 Subject: [PATCH] Provisioning: Install libusb for Ubuntu 24.04 arm and macOS 14 arm Required by qt-apps/qdb Pick-to: 6.8 Task-number: QTQAINFRA-6571 Change-Id: I6bf217af528e4daca548c14abef30ec9e76c2161 Reviewed-by: Tero Heikkinen Reviewed-by: Toni Saario --- .../qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh | 2 ++ coin/provisioning/qtci-macos-14-arm/29-libusb.sh | 9 +++++++++ 2 files changed, 11 insertions(+) create mode 100755 coin/provisioning/qtci-macos-14-arm/29-libusb.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh index b4c9d149..1ec05fe4 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh @@ -235,6 +235,8 @@ installPackages+=(cmake) installPackages+=(lld) # Fix dependencies in shared ffmpeg libs installPackages+=(patchelf) +# For qp-apps/qdb +installPackages+=(libusb-1.0-0-dev) echo "Running update for apt" waitLoop diff --git a/coin/provisioning/qtci-macos-14-arm/29-libusb.sh b/coin/provisioning/qtci-macos-14-arm/29-libusb.sh new file mode 100755 index 00000000..5562889e --- /dev/null +++ b/coin/provisioning/qtci-macos-14-arm/29-libusb.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash +#Copyright (C) 2024 The Qt Company Ltd +#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +set -ex + +BASEDIR=$(dirname "$0") + +"$BASEDIR/../common/macos/libusb.sh"