From 3abcbc655a2cc4ae212728ff4ec5b103c37f9fa2 Mon Sep 17 00:00:00 2001 From: Matti Paaso Date: Fri, 29 May 2026 15:05:13 +0300 Subject: [PATCH] Remove libusb installation from macos Change-Id: I5f69afe376087958ef5a6a2985bd87170e3f8a8d Reviewed-by: Ville-Pekka Karhu (cherry picked from commit 36efc0bfb03d74c6e154f1228237491f9001eb80) Reviewed-by: Toni Saario --- coin/provisioning/common/macos/libusb.sh | 35 ------------------- .../qtci-macos-11-x86_64/29-libusb.sh | 9 ----- .../qtci-macos-12-arm/29-libusb.sh | 9 ----- .../qtci-macos-12-x86_64/29-libusb.sh | 9 ----- .../qtci-macos-13-x86_64/29-libusb.sh | 9 ----- .../qtci-macos-14-arm/29-libusb.sh | 9 ----- .../qtci-macos-14-x86_64/29-libusb.sh | 9 ----- .../qtci-macos-15-x86_64/29-libusb.sh | 9 ----- 8 files changed, 98 deletions(-) delete mode 100755 coin/provisioning/common/macos/libusb.sh delete mode 100755 coin/provisioning/qtci-macos-11-x86_64/29-libusb.sh delete mode 100755 coin/provisioning/qtci-macos-12-arm/29-libusb.sh delete mode 100755 coin/provisioning/qtci-macos-12-x86_64/29-libusb.sh delete mode 100755 coin/provisioning/qtci-macos-13-x86_64/29-libusb.sh delete mode 100755 coin/provisioning/qtci-macos-14-arm/29-libusb.sh delete mode 100755 coin/provisioning/qtci-macos-14-x86_64/29-libusb.sh delete mode 100755 coin/provisioning/qtci-macos-15-x86_64/29-libusb.sh diff --git a/coin/provisioning/common/macos/libusb.sh b/coin/provisioning/common/macos/libusb.sh deleted file mode 100755 index 2abe6cbf..00000000 --- a/coin/provisioning/common/macos/libusb.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash -# Copyright (C) 2020 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 - -# Install libusb -set -ex - -source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -brew install libusb -read -r -a arr <<< "$(brew list --versions libusb)" -version=${arr[1]} -echo "libusb = $version" >> ~/versions.txt - -mkdir /tmp/arm64/ -mkdir /tmp/amd64/ - -case $(sw_vers -productVersion) in - 11*) codename=big_sur;; - 12*) codename=monterey;; - 13*) codename=ventura;; - 14*) codename=sonoma;; -esac - -brew fetch --bottle-tag=arm64_"${codename}" libusb -brew fetch --bottle-tag="${codename}" libusb -tar xf "$(brew --cache --bottle-tag=arm64_"${codename}" libusb)" -C /tmp/arm64/ -tar xf "$(brew --cache --bottle-tag="${codename}" libusb)" -C /tmp/amd64 -for f in /tmp/arm64/libusb/"$version"/lib/* ; do - if lipo -info "$f" >/dev/null 2>&1; then - file="$(basename "$f")" - lipo -create -output "$(brew --cellar)/libusb/$version/lib/$file" \ - "/tmp/arm64/libusb/$version/lib/$file" \ - "/tmp/amd64/libusb/$version/lib/$file" - fi -done diff --git a/coin/provisioning/qtci-macos-11-x86_64/29-libusb.sh b/coin/provisioning/qtci-macos-11-x86_64/29-libusb.sh deleted file mode 100755 index e9e9e238..00000000 --- a/coin/provisioning/qtci-macos-11-x86_64/29-libusb.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash -#Copyright (C) 2023 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" diff --git a/coin/provisioning/qtci-macos-12-arm/29-libusb.sh b/coin/provisioning/qtci-macos-12-arm/29-libusb.sh deleted file mode 100755 index e9e9e238..00000000 --- a/coin/provisioning/qtci-macos-12-arm/29-libusb.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash -#Copyright (C) 2023 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" diff --git a/coin/provisioning/qtci-macos-12-x86_64/29-libusb.sh b/coin/provisioning/qtci-macos-12-x86_64/29-libusb.sh deleted file mode 100755 index e9e9e238..00000000 --- a/coin/provisioning/qtci-macos-12-x86_64/29-libusb.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash -#Copyright (C) 2023 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" diff --git a/coin/provisioning/qtci-macos-13-x86_64/29-libusb.sh b/coin/provisioning/qtci-macos-13-x86_64/29-libusb.sh deleted file mode 100755 index e9e9e238..00000000 --- a/coin/provisioning/qtci-macos-13-x86_64/29-libusb.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash -#Copyright (C) 2023 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" diff --git a/coin/provisioning/qtci-macos-14-arm/29-libusb.sh b/coin/provisioning/qtci-macos-14-arm/29-libusb.sh deleted file mode 100755 index 5562889e..00000000 --- a/coin/provisioning/qtci-macos-14-arm/29-libusb.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/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" diff --git a/coin/provisioning/qtci-macos-14-x86_64/29-libusb.sh b/coin/provisioning/qtci-macos-14-x86_64/29-libusb.sh deleted file mode 100755 index e9e9e238..00000000 --- a/coin/provisioning/qtci-macos-14-x86_64/29-libusb.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash -#Copyright (C) 2023 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" diff --git a/coin/provisioning/qtci-macos-15-x86_64/29-libusb.sh b/coin/provisioning/qtci-macos-15-x86_64/29-libusb.sh deleted file mode 100755 index e9e9e238..00000000 --- a/coin/provisioning/qtci-macos-15-x86_64/29-libusb.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash -#Copyright (C) 2023 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"