mirror of
git://code.qt.io/qt/qt5.git
synced 2026-04-25 06:07:47 +08:00
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts: .gitmodules coin/platform_configs/default.txt Change-Id: I78eb6b6522c678fb40f1202c0040c1c87ff890a6
This commit is contained in:
@@ -110,7 +110,7 @@ installPackages+=(g++-multilib)
|
||||
# python3 development package
|
||||
installPackages+=(python3-dev)
|
||||
installPackages+=(python3-pip)
|
||||
installPackages+=(python3-virtualenv)
|
||||
installPackages+=(virtualenv)
|
||||
installPackages+=(python3-wheel)
|
||||
# python2 development package
|
||||
installPackages+=(python-dev)
|
||||
|
||||
@@ -5,5 +5,4 @@ set -ex
|
||||
# shellcheck source=../common/linux/gcc.sh
|
||||
source "${BASH_SOURCE%/*}/../common/linux/gcc.sh"
|
||||
|
||||
InstallGCC 8.2.0 50 19e40bea7df5dbadb22eec09ada621ecd9235687 19926bdb6c4b58891015929853d41aeff019d400
|
||||
|
||||
InstallGCC 9.1.0 50 3953fa0d34a467630088d2a43603f74a36a80468 ded538076858926d361af790d59c1f8440dd29b2
|
||||
|
||||
@@ -113,3 +113,9 @@ fi
|
||||
echo "Yocto ARMv7 toolchain = $versionARM" >> ~/versions.txt
|
||||
echo "Yocto ARM64 toolchain = $versionARM64" >> ~/versions.txt
|
||||
echo "Yocto MIPS64 toolchain = $versionMIPS64" >> ~/versions.txt
|
||||
|
||||
# List qt user in qemu toolchain sysroots
|
||||
sudo sh -c "grep ^qt /etc/passwd >> /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/etc/passwd"
|
||||
sudo sh -c "grep ^qt /etc/group >> /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/etc/group"
|
||||
sudo sh -c "grep ^qt /etc/passwd >> /opt/yocto-arm64/sysroots/aarch64-poky-linux/etc/passwd"
|
||||
sudo sh -c "grep ^qt /etc/group >> /opt/yocto-arm64/sysroots/aarch64-poky-linux/etc/group"
|
||||
|
||||
6
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/09-install-openssl.sh
Executable file
6
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/09-install-openssl.sh
Executable file
@@ -0,0 +1,6 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -ex
|
||||
|
||||
# shellcheck source=../common/unix/install-openssl.sh
|
||||
source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "linux"
|
||||
Reference in New Issue
Block a user