diff options
| author | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2019-04-29 12:18:48 +0300 |
|---|---|---|
| committer | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2019-05-12 13:02:16 +0000 |
| commit | 8f073cea69dde52b66577de4417fbc34db9e7476 (patch) | |
| tree | b883aa63fc325c9c9878573150e976de1bdd9048 | |
| parent | a41e568a780ab33e5f3823a1f8a06d47fd9099ee (diff) | |
Do DeveloperBuild for Boot2Qt
Task-number: QTBUG-63152
Change-Id: I2a0239625bf5cfa4456c64e90e647c70d4533589
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| -rw-r--r-- | coin/platform_configs/default.txt | 4 | ||||
| -rw-r--r-- | coin/platform_configs/qtbase.txt | 2 | ||||
| -rw-r--r-- | coin/platform_configs/qtdeclarative.txt | 4 | ||||
| -rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 3959e24a..cf6ec311 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -21,8 +21,8 @@ qtci-macos-10.13-x86_64-2 TvOS_ANY multi Clang qtci-macos-10.13-x86_64-2 WatchOS_ANY multi Clang DebugAndRelease DisableTests qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.4-x86_64 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC Release -qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC Release +qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC DeveloperBuild +qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC DeveloperBuild qtci-linux-Ubuntu-18.04-x86_64 GCC TestOnly LicenseCheck qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qtbase.txt b/coin/platform_configs/qtbase.txt index aaac89d0..15eb3b59 100644 --- a/coin/platform_configs/qtbase.txt +++ b/coin/platform_configs/qtbase.txt @@ -1,7 +1,5 @@ Template Target OS Target arch Compiler Features --------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC DeveloperBuild DisableTests -qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC DeveloperBuild DisableTests qtci-windows-10-x86_64-10 WinRT_10 x86_64 MSVC2015 DeveloperBuild Static Release ForceDebugInfo qtci-linux-openSUSE-42.3-x86_64 WebAssembly GCC DeveloperBuild NoPch DisableTests diff --git a/coin/platform_configs/qtdeclarative.txt b/coin/platform_configs/qtdeclarative.txt deleted file mode 100644 index e2b69559..00000000 --- a/coin/platform_configs/qtdeclarative.txt +++ /dev/null @@ -1,4 +0,0 @@ -Template Target OS Target arch Compiler Features ---------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC DeveloperBuild -qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC DeveloperBuild diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh index 1c856c0c..c9daf834 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh @@ -90,3 +90,9 @@ fi echo "Yocto ARMv7 toolchain = $versionARM" >> ~/versions.txt echo "Yocto ARM64 toolchain = $versionARM64" >> ~/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" |