diff options
Diffstat (limited to 'meta-boot2qt-distro')
9 files changed, 25 insertions, 29 deletions
diff --git a/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf b/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf index 98fb5294..b4f4eef4 100644 --- a/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf +++ b/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf @@ -44,7 +44,3 @@ SERIAL_CONSOLES = "115200;ttymxc0 \ 115200;ttymxc1" KERNEL_MODULE_AUTOLOAD += "atmel_mxt_ts" - -PREFERRED_VERSION_imx-gpu-viv = "6.2.4.p1.2-aarch32" -PREFERRED_VERSION_imx-gpu-g2d = "6.2.4.p1.2" -PREFERRED_VERSION_kernel-module-imx-gpu-viv = "6.2.4.p1.2" diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf b/meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf index 1fade70d..265d24f8 100644 --- a/meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf +++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf @@ -40,6 +40,3 @@ IMAGE_BOOT_FILES += " \ SPL-${MACHINE}-spl;${MACHINEDIR}/SPL \ " -PREFERRED_VERSION_imx-gpu-viv = "6.2.4.p1.2-aarch32" -PREFERRED_VERSION_imx-gpu-g2d = "6.2.4.p1.2" -PREFERRED_VERSION_kernel-module-imx-gpu-viv = "6.2.4.p1.2" diff --git a/meta-boot2qt-distro/conf/distro/include/jetson.inc b/meta-boot2qt-distro/conf/distro/include/jetson.inc index 3212cb96..b2b38ffc 100644 --- a/meta-boot2qt-distro/conf/distro/include/jetson.inc +++ b/meta-boot2qt-distro/conf/distro/include/jetson.inc @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -41,3 +41,6 @@ QBSP_IMAGE_CONTENT = "\ ${IMAGE_LINK_NAME}.conf \ ${IMAGE_LINK_NAME}.flasher.tar.gz \ " + +# NVIDIA's Vulkan support is for X only +DISTRO_FEATURES_remove = "vulkan" diff --git a/meta-boot2qt-distro/conf/distro/include/toradex.inc b/meta-boot2qt-distro/conf/distro/include/toradex.inc index 9a252d08..95a52eee 100644 --- a/meta-boot2qt-distro/conf/distro/include/toradex.inc +++ b/meta-boot2qt-distro/conf/distro/include/toradex.inc @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -34,8 +34,10 @@ require conf/machine/include/${MACHINE}.inc BBMASK += "\ meta-toradex-nxp/recipes-graphics/xorg-xserver \ + meta-toradex-nxp/recipes-multimedia/gstreamer \ meta-toradex-bsp-common/recipes-devtools/python \ meta-toradex-bsp-common/recipes-devtools/e2fsprogs \ + meta-toradex-bsp-common/recipes-core/systemd \ " PREFERRED_PROVIDER_u-boot = "u-boot-toradex" @@ -49,3 +51,11 @@ IMAGE_BOOT_FILES += " \ fwd_mmc.img;flash_mmc.img \ ${MACHINE}/*;${MACHINEDIR}/ \ " + +# use 1.14.0 that matches the imx version of gstreamer +PREFERRED_VERSION_gstreamer1.0-plugins-ugly = "1.14.0" +PREFERRED_VERSION_gstreamer1.0-libav = "1.14.0" + +# override tezi bbclass +IMAGE_CLASSES_remove = " image_type_tezi" +IMAGE_CLASSES_append = " image_type_tezi_thud" diff --git a/meta-boot2qt-distro/conf/layer.conf b/meta-boot2qt-distro/conf/layer.conf index d9ededa1..4a6a22e5 100644 --- a/meta-boot2qt-distro/conf/layer.conf +++ b/meta-boot2qt-distro/conf/layer.conf @@ -34,10 +34,9 @@ BBPATH .= ":${LAYERDIR}" BBFILES += "${LAYERDIR}/recipes*/*/*.bb \ ${LAYERDIR}/recipes*/*/*.bbappend \ " -BBMASK += "meta-qt5/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_%.bbappend" BBFILE_COLLECTIONS += "b2qt-distro" BBFILE_PATTERN_b2qt-distro := "^${LAYERDIR}/" BBFILE_PRIORITY_b2qt-distro = "20" -LAYERSERIES_COMPAT_b2qt-distro = "sumo" +LAYERSERIES_COMPAT_b2qt-distro = "thud" diff --git a/meta-boot2qt-distro/recipes-kernel/linux/linux-yocto/uprobe_event.cfg b/meta-boot2qt-distro/recipes-kernel/linux/linux-yocto/uprobe_event.cfg index aba82daa..81f7be96 100644 --- a/meta-boot2qt-distro/recipes-kernel/linux/linux-yocto/uprobe_event.cfg +++ b/meta-boot2qt-distro/recipes-kernel/linux/linux-yocto/uprobe_event.cfg @@ -1 +1 @@ -CONFIG_UPROBE_EVENT=y +CONFIG_UPROBE_EVENTS=y diff --git a/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend index 0271b6d5..37c9ca74 100644 --- a/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend +++ b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend @@ -28,19 +28,3 @@ ############################################################################ PACKAGECONFIG_append = " faad" - -inherit qmake5_paths - -PACKAGECONFIG[qt5] = '--enable-qt \ - --with-moc="${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/moc" \ - --with-uic="${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/uic" \ - --with-rcc="${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/rcc" \ - ,--disable-qt,qtbase qtdeclarative qtbase-native' - -# The GStreamer Qt5 plugin needs desktop OpenGL or OpenGL ES to work, so make sure it is enabled -python() { - cur_packageconfig = d.getVar('PACKAGECONFIG',True).split() - if 'qt5' in cur_packageconfig and not (('opengl' in cur_packageconfig) or ('gles2' in cur_packageconfig)): - gl_packageconfig = d.getVar('PACKAGECONFIG_GL',True) - d.appendVar('PACKAGECONFIG', ' ' + gl_packageconfig) -} diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb index 9fac3f68..8807cf7a 100644 --- a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb +++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb @@ -37,10 +37,14 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" MACHINE_EXTRA_INSTALL_SDK ?= "" +GCC-SANITIZERS ?= "gcc-sanitizers" +GCC-SANITIZERS_mipsarch = "" +GCC-SANITIZERS_libc-musl = "" + RDEPENDS_${PN} += " \ ${MACHINE_EXTRA_INSTALL_SDK} \ packagegroup-core-standalone-sdk-target \ - ${@contains_regex('MACHINEOVERRIDES', '(x86_64|i.86|powerpc|sparc|s390|arm|aarch64)', 'gcc-sanitizers', '', d)} \ + ${GCC-SANITIZERS} \ \ qt3d-dev \ qt3d-runtime-dev \ diff --git a/meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend index 36b44097..df45875e 100644 --- a/meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend +++ b/meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend @@ -46,3 +46,6 @@ fakeroot do_generate_qt_environment_file_mingw32() { } SRC_URI_append_mingw32 = "file://0001-disable-qt_random_cpu.patch" + +# qdatetime.cpp: error: 'localtime_r' was not declared in this scope +QT_CONFIG_FLAGS_append_mingw32 = " -D_POSIX_C_SOURCE" |