diff options
45 files changed, 252 insertions, 75 deletions
diff --git a/.gitattributes b/.gitattributes index cb2381c0..f6a86105 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,3 @@ +/coin export-ignore # linguist overrides recipes-*/**/*.inc linguist-language=BitBake diff --git a/coin/module_config.yaml b/coin/module_config.yaml new file mode 100644 index 00000000..263d8f04 --- /dev/null +++ b/coin/module_config.yaml @@ -0,0 +1,180 @@ +version: 1 +accept_configuration: + condition: and + conditions: + - condition: property + property: host.osVersion + equals_value: Ubuntu_18_04 + - condition: property + property: target.osVersion + equals_value: QEMU + - condition: property + property: target.arch + in_values: [ARMv7, ARM64] + +environment: &environment + type: Group + instructions: + - type: EnvironmentVariable + variableName: POKY_SHA1 + variableValue: 38d5c8ea98cfa49825c473eba8984c12edf062be + - type: EnvironmentVariable + variableName: OE_SHA1 + variableValue: 8d5dcd6522e9d15e68637b6d7dda0401f9bb91d0 + - type: EnvironmentVariable + variableName: MACHINE + variableValue: qemuarm64 + enable_if: + condition: property + property: target.arch + equals_value: ARM64 + - type: EnvironmentVariable + variableName: MACHINE + variableValue: qemux86 + enable_if: + condition: property + property: target.arch + equals_value: ARMv7 + +build_instructions: + - *environment + - type: SetBuildDirectory + directory: "{{.AgentWorkingDir}}/build" + - type: MakeDirectory + directory: "{{.BuildDir}}" + - type: ChangeDirectory + directory: "{{.BuildDir}}" + - type: ExecuteCommand + command: ["sudo", "mkdir", "-p", "/mnt/yocto-cache"] + userMessageOnFailure: "Could not create '/mnt/yocto-cache' directory" + - type: ExecuteCommand + command: ["sudo", "mount", "yocto-cache.intra.qt.io:/srv/yocto-cache", "/mnt/yocto-cache"] + userMessageOnFailure: "Could not mount yocto cache." + - type: WriteFile + fileContents: | + # https://github.com/shr-project/jenkins-jobs/blob/master/jenkins-job.sh + INHERIT += "reproducible_build_simple" + # We want musl and glibc to share the same tmpfs, so instead of appending default "-${TCLIBC}" we append "fs" + TCLIBCAPPEND = "fs" + PREFERRED_PROVIDER_udev = "systemd" + PREFERRED_PROVIDER_virtual/fftw = "fftw" + # use gold + DISTRO_FEATURES_append = " ld-is-gold" + # use ptest + DISTRO_FEATURES_append = " ptest" + # use systemd + DISTRO_FEATURES_append = " systemd" + DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit" + VIRTUAL-RUNTIME_init_manager = "systemd" + VIRTUAL-RUNTIME_initscripts = "" + # use opengl + DISTRO_FEATURES_append = " opengl" + # use wayland to fix building weston and qtwayland + DISTRO_FEATURES_append = " wayland" + PREFERRED_PROVIDER_jpeg = "libjpeg-turbo" + PREFERRED_PROVIDER_jpeg-native = "libjpeg-turbo-native" + PREFERRED_PROVIDER_gpsd = "gpsd" + PREFERRED_PROVIDER_e-wm-sysactions = "e-wm" + ESYSACTIONS = "e-wm-sysactions" + # don't pull libhybris unless explicitly asked for + PREFERRED_PROVIDER_virtual/libgl ?= "mesa" + PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" + PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" + PREFERRED_PROVIDER_virtual/egl ?= "mesa" + # to fix fsoaudiod, alsa-state conflict in shr-image-all + VIRTUAL-RUNTIME_alsa-state = "" + # to prevent alsa-state being pulled into -dev or -dbg images + RDEPENDS_${PN}-dev_pn-alsa-state = "" + RDEPENDS_${PN}-dbg_pn-alsa-state = "" + # to fix dependency on conflicting x11-common from packagegroup-core-x11 + VIRTUAL-RUNTIME_xserver_common ?= "xserver-common" + RDEPENDS_${PN}-dev_pn-x11-common = "" + RDEPENDS_${PN}-dbg_pn-x11-common = "" + # to fix apm, fso-apm conflict in shr-image-all + VIRTUAL-RUNTIME_apm = "fso-apm" + # require conf/distro/include/qt5-versions.inc + # QT5_VERSION = "5.4.0+git%" + # for qtwebkit etc + # see https://bugzilla.yoctoproject.org/show_bug.cgi?id=5013 + # DEPENDS_append_pn-qtbase = " mesa" + PACKAGECONFIG_append_pn-qtbase = " icu gl accessibility freetype fontconfig" + # qtwayland doesn't like egl and xcomposite-glx enabled at the same time + # http://lists.openembedded.org/pipermail/openembedded-devel/2016-December/110444.html + PACKAGECONFIG_remove_pn-qtwayland = "xcomposite-egl xcomposite-glx" + # for webkit-efl + PACKAGECONFIG_append_pn-harfbuzz = " icu" + inherit blacklist + # PNBLACKLIST[samsung-rfs-mgr] = "needs newer libsamsung-ipc with negative D_P: Requested 'samsung-ipc-1.0 >= 0.2' but version of libsamsung-ipc is 0.1.0" + PNBLACKLIST[android-system] = "depends on lxc from meta-virtualiazation which isn't included in my world builds" + PNBLACKLIST[bigbuckbunny-1080p] = "big and doesn't really need to be tested so much" + PNBLACKLIST[bigbuckbunny-480p] = "big and doesn't really need to be tested so much" + PNBLACKLIST[bigbuckbunny-720p] = "big and doesn't really need to be tested so much" + PNBLACKLIST[bigbuckbunny-720p] = "big and doesn't really need to be tested so much" + PNBLACKLIST[tearsofsteel-1080p] = "big and doesn't really need to be tested so much" + PNBLACKLIST[build-appliance-image] = "tries to include whole downloads directory in /home/builder/poky :/" + # enable reporting + # needs http://patchwork.openembedded.org/patch/68735/ + #ERR_REPORT_SERVER = "errors.yoctoproject.org" + #ERR_REPORT_PORT = "80" + #ERR_REPORT_USERNAME = "Martin Jansa" + #ERR_REPORT_EMAIL = "Martin.Jansa@gmail.com" + #ERR_REPORT_UPLOAD_FAILURES = "1" + #INHERIT += "report-error" + # needs patch with buildstats-summary.bbclass + INHERIT += "buildstats buildstats-summary" + # be more strict with QA warnings, turn them all to errors: + ERROR_QA_append = " ldflags useless-rpaths rpaths staticdev libdir xorg-driver-abi textrel already-stripped incompatible-license files-invalid installed-vs-shipped compile-host-path install-host-path pn-overrides infodir build-deps unknown-configure-option symlink-to-sysroot multilib invalid-packageconfig host-user-contaminated uppercase-pn" + WARN_QA_remove = " ldflags useless-rpaths rpaths staticdev libdir xorg-driver-abi textrel already-stripped incompatible-license files-invalid installed-vs-shipped compile-host-path install-host-path pn-overrides infodir build-deps unknown-configure-option symlink-to-sysroot multilib invalid-packageconfig host-user-contaminated uppercase-pn" + # enable thumb for broader test coverage (oe-core autobuilder doesn't have thumb enabled) + PREFERRED_ARM_INSTRUCTION_SET ?= "thumb" + ARM_INSTRUCTION_SET = "${PREFERRED_ARM_INSTRUCTION_SET}" + # use musl for qemux86 and qemux86copy + TCLIBC_qemux86 = "musl" + TCLIBC_qemux86copy = "musl" + # limit parallel make to avoid OOM + PARALLEL_MAKE_pn-qtwebkit = "-j 8" + filename: "{{.BuildDir}}/world_fixes.inc" + fileMode: 420 + - type: WriteFile + fileContents: | + #!/bin/bash -xe + git clone git://git.yoctoproject.org/poky --reference /mnt/yocto-cache/mirror/poky.git + (cd poky; git checkout ${POKY_SHA1}) + git clone git://github.com/openembedded/meta-openembedded --reference /mnt/yocto-cache/mirror/meta-openembedded.git + (cd meta-openembedded; git checkout ${OE_SHA1}) + + source ./poky/oe-init-build-env + export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE SSTATE_DIR DL_DIR" + export DL_DIR=/mnt/yocto-cache/downloads + export BB_GENERATE_MIRROR_TARBALLS=1 + export SSTATE_DIR=/mnt/yocto-cache/sstate-caches/$(sed -n -e "s/DISTRO_CODENAME.*\"\(.*\)\"/\1/p" ../poky/meta-*/conf/distro/poky.conf) + bitbake-layers add-layer ../meta-openembedded/meta-oe + bitbake-layers add-layer ${SOURCE_DIR} + + echo 'require ../world_fixes.inc' >> conf/local.conf + + # EXCLUDE_FROM_WORLD + rm -f ${SOURCE_DIR}/recipes-qt/examples/qt5-opengles2-test_git.bb + + bitbake $(find ${SOURCE_DIR} -name *.bb | xargs -n1 basename | sed -e 's/\([^._]*\).*/\1/') + filename: "{{.BuildDir}}/start-build" + fileMode: 420 + - type: ExecuteCommand + command: ["chmod", "+x", "{{.BuildDir}}/start-build"] + userMessageOnFailure: "Could not add execution right to the start-build." + - type: EnvironmentVariable + variableName: DL_DIR + variableValue: "/mnt/yocto-cache/downloads" + - type: EnvironmentVariable + variableName: SOURCE_DIR + variableValue: "{{.SourceDir}}" + - type: ExecuteCommand + command: ["{{.BuildDir}}/start-build"] + maxTimeInSeconds: 28800 + maxTimeBetweenOutput: 28800 + userMessageOnFailure: "Build failed." + - type: ExecuteCommand + command: ["sudo", "umount", "/mnt/yocto-cache"] + userMessageOnFailure: "Unmounting cache failed." + +test_instructions: [] diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 03a29081..ee3707a0 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -194,4 +194,4 @@ fakeroot do_generate_qt_environment_file() { do_generate_qt_environment_file[umask] = "022" addtask generate_qt_environment_file after do_install before do_package -SRCREV = "abfb1b8665923ce2824392f3a04e5e4ac3871017" +SRCREV = "f0b93f7a4b4281c5470280eb36b7c0ef5948a921" diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 8be92d43..659c8987 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -36,6 +36,6 @@ do_configure_prepend() { ${S}/src/quick3d/imports/input/importsinput.pro } -SRCREV = "bbe0805bfddcb61f7c07a6454793e76f142a32bc" +SRCREV = "b77712dd95adb6644e9af3bf98a2a6ebc5a52ec4" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qt5-creator/0003-Link-with-libexecinfo-on-musl.patch b/recipes-qt/qt5/qt5-creator/0003-Link-with-libexecinfo-on-musl.patch index 9b225a57..d17f60b4 100644 --- a/recipes-qt/qt5/qt5-creator/0003-Link-with-libexecinfo-on-musl.patch +++ b/recipes-qt/qt5/qt5-creator/0003-Link-with-libexecinfo-on-musl.patch @@ -1,4 +1,4 @@ -From 88afa7173c7d0c97e15d9ee9c58e8c0364799bb7 Mon Sep 17 00:00:00 2001 +From ec7aec2f6c56889c96dc12af46059a7f3d4c3a37 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 16 Jan 2018 13:26:57 +0000 Subject: [PATCH] Link with libexecinfo on musl @@ -6,8 +6,9 @@ Subject: [PATCH] Link with libexecinfo on musl Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- - src/plugins/debugger/debugger.pro | 1 + - 1 file changed, 1 insertion(+) + src/plugins/debugger/debugger.pro | 1 + + src/plugins/qmldesigner/designercore/designercore-lib.pri | 2 ++ + 2 files changed, 3 insertions(+) diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro index f5a34aa0d5..4a1359dd5c 100644 @@ -18,3 +19,16 @@ index f5a34aa0d5..4a1359dd5c 100644 include(shared/shared.pri) +LIBS *= -lexecinfo +diff --git a/src/plugins/qmldesigner/designercore/designercore-lib.pri b/src/plugins/qmldesigner/designercore/designercore-lib.pri +index 935b29728e..31527267fd 100644 +--- a/src/plugins/qmldesigner/designercore/designercore-lib.pri ++++ b/src/plugins/qmldesigner/designercore/designercore-lib.pri +@@ -2,6 +2,8 @@ include($$PWD/filemanager/filemanager.pri) + + QT += network + ++LIBS *= -lexecinfo ++ + DEFINES += TEST_EXPORTS + DEFINES += DESIGNER_CORE_LIBRARY + INCLUDEPATH += $$PWD \ diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 79a1e450..618a0ee8 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc @@ -3,7 +3,7 @@ QT_MODULE ?= "${BPN}" QT_MODULE_BRANCH ?= "5.12" -QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}" +QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1" # each module needs to define valid SRCREV SRC_URI = " \ @@ -14,4 +14,4 @@ CVE_PRODUCT = "qt" S = "${WORKDIR}/git" -PV = "5.12.5+git${SRCPV}" +PV = "5.12.6+git${SRCPV}" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index ae675839..6d8ac006 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -142,4 +142,4 @@ do_install() { echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake } -SRCREV = "abfb1b8665923ce2824392f3a04e5e4ac3871017" +SRCREV = "f0b93f7a4b4281c5470280eb36b7c0ef5948a921" diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index 85b6b63d..4d558152 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch @@ -21,17 +21,17 @@ Change-Id: I0591ed5da0d61d7cf1509d420e6b293582f1863c Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- configure | 2 +- - mkspecs/features/configure.prf | 4 +-- - mkspecs/features/qt.prf | 6 ++--- + mkspecs/features/configure.prf | 4 ++-- + mkspecs/features/qt.prf | 6 +++--- mkspecs/features/qt_functions.prf | 2 +- - mkspecs/linux-oe-g++/qmake.conf | 39 ++++++++++++++++++++++++++++ + mkspecs/linux-oe-g++/qmake.conf | 39 ++++++++++++++++++++++++++++++++++++ mkspecs/linux-oe-g++/qplatformdefs.h | 1 + 6 files changed, 47 insertions(+), 7 deletions(-) create mode 100644 mkspecs/linux-oe-g++/qmake.conf create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h diff --git a/configure b/configure -index ef7bad1bfc..dcca0f9135 100755 +index ef7bad1..dcca0f9 100755 --- a/configure +++ b/configure @@ -712,7 +712,7 @@ fi @@ -44,7 +44,7 @@ index ef7bad1bfc..dcca0f9135 100755 # build qmake diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf -index 934a18a924..0f5b1b6333 100644 +index 934a18a..0f5b1b6 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf @@ -46,14 +46,14 @@ defineTest(qtCompileTest) { @@ -89,7 +89,7 @@ index 89f4946c50..97c1b43ccb 100644 # run qmlimportscanner qtPrepareTool(QMLIMPORTSCANNER, qmlimportscanner, , system) diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 1903e509c8..c093dd4592 100644 +index 1903e50..c093dd4 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -69,7 +69,7 @@ defineTest(qtHaveModule) { @@ -103,7 +103,7 @@ index 1903e509c8..c093dd4592 100644 cmd = perl -w $$system_path($${cmd}.pl) diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf new file mode 100644 -index 0000000000..c202c47fa1 +index 0000000..c202c47 --- /dev/null +++ b/mkspecs/linux-oe-g++/qmake.conf @@ -0,0 +1,39 @@ @@ -148,7 +148,7 @@ index 0000000000..c202c47fa1 +load(qt_config) diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h new file mode 100644 -index 0000000000..5d22fb4101 +index 0000000..5d22fb4 --- /dev/null +++ b/mkspecs/linux-oe-g++/qplatformdefs.h @@ -0,0 +1 @@ diff --git a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch index 6f06d61b..60ae7314 100644 --- a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch +++ b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch @@ -15,12 +15,12 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com> 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.pri b/configure.pri -index 09c34af4ee..8079233627 100644 +index b109192..cccbf1c 100644 --- a/configure.pri +++ b/configure.pri -@@ -839,10 +839,10 @@ defineTest(qtConfOutput_preparePaths) { - "static const char qt_configure_installation [12+11] = \"qt_instdate=2012-12-20\";" \ - "" \ +@@ -836,10 +836,10 @@ defineTest(qtConfOutput_preparePaths) { + + $${currentConfig}.output.qconfigSource = \ "/* Installation Info */" \ - "static const char qt_configure_prefix_path_str [12+256] = \"qt_prfxpath=$$config.input.prefix\";" \ + "static const char qt_configure_prefix_path_str [12+512] = \"qt_prfxpath=$$config.input.prefix\";" \ diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 07cbc6da..caf5a061 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -276,22 +276,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" -TARGET_MKSPEC ?= "linux-g++" - -# use clean mkspecs on target -pkg_postinst_${PN}-tools () { -sed -i \ - -e 's:HostSpec =.*:HostSpec = ${TARGET_MKSPEC}:g' \ - -e 's:TargetSpec =.*:TargetSpec = ${TARGET_MKSPEC}:g' \ - $D${OE_QMAKE_PATH_BINS}/qt.conf -} - -pkg_postinst_${PN}-mkspecs () { -sed -i 's: cross_compile : :g' $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qconfig.pri -sed -i \ - -e 's: cross_compile : :g' \ - -e 's:HOST_QT_TOOLS =.*::g' \ - $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri -} - -SRCREV = "abfb1b8665923ce2824392f3a04e5e4ac3871017" +SRCREV = "f0b93f7a4b4281c5470280eb36b7c0ef5948a921" diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index d1a6c9f0..07c73459 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bb +++ b/recipes-qt/qt5/qtcanvas3d_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "qtdeclarative" -SRCREV = "ae8749c175b64222190cdebc6d0b2eceddc0bfc8" +SRCREV = "51e8dc59d87463f32dab0e401e9ae17615c7b790" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index 988c8fb0..568aadad 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia" -SRCREV = "dd65e383b2f900b8e661b678c746cd71fdef697e" +SRCREV = "969fc5bf94e8e0e6cd86c79c38e11074de235273" # The same issue as in qtbase: # http://errors.yoctoproject.org/Errors/Details/152641/ diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 7eb0d5b0..fb734cfb 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb @@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,bluez5" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "0a5bf7a41e5c2c4a36efeace83444ceaee79c945" +SRCREV = "33f5988eadf1b748d75deec8bc12afc1d47ea52f" diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 6a0792bb..c43ba7b9 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb @@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" -SRCREV = "3858190b2b2e71a7b63e9976da2b22f1c342e3b3" +SRCREV = "2b753d7caa9f780d6a76829db516e3fb859c3353" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index f3911174..a2f88b64 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -24,6 +24,6 @@ do_install_append_class-nativesdk() { rm -rf ${D}${OE_QMAKE_PATH_QML} } -SRCREV = "7b47350736f46c59d81238d3d6284358a652983b" +SRCREV = "179c4b689d1a7b9e9edb71ddf545dc237bca6704" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index c4ff0a0d..d68dae38 100644 --- a/recipes-qt/qt5/qtgamepad_git.bb +++ b/recipes-qt/qt5/qtgamepad_git.bb @@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "09de115d0d31fbc62d16aef821f96b487dbf5169" +SRCREV = "39b7df80c9b58dffc7a6e9e68b99e1b9f78ed2e0" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 3ca0f104..9ab8c05d 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb @@ -18,4 +18,4 @@ RDEPENDS_${PN}-dev = "" # http://errors.yoctoproject.org/Errors/Build/44912/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "06116f294697e052edc31ac35dc58f46bf493913" +SRCREV = "7ce8cd84f7f8ce8d0377019f7087b2352b5626e7" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 90bc94ed..c1083a0a 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb @@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "53f8fd57b698b97aded363700306fe61c4b9ea17" +SRCREV = "dad286f15b75f36f37d4523ac86696e5133e58cb" diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb index cd598af4..dda491b4 100644 --- a/recipes-qt/qt5/qtknx_git.bb +++ b/recipes-qt/qt5/qtknx_git.bb @@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "ee2f01020005b1baa63de918be1dc75ae581f7b1" +SRCREV = "c8786b87a1d9cbe2d6ee4234064beba93803d18d" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 30a9d127..a1e7c61f 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -36,7 +36,7 @@ SRC_URI += " \ ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ " -SRCREV_qtlocation = "1de7ca6175bd3e4a542a038a089cfd73c9eaa27a" +SRCREV_qtlocation = "ad359c55d36f39c7f243bee8960d490772bfe84e" SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53" SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb index fa7b28a4..bb264da9 100644 --- a/recipes-qt/qt5/qtmqtt_git.bb +++ b/recipes-qt/qt5/qtmqtt_git.bb @@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "b4b171877ece7da3dab869fb40019d493560097c" +SRCREV = "b70017b66d5a3d8daeaa7ab2a91c910f0535ffa3" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index be08ff3e..1d4fa402 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -37,4 +37,4 @@ SRC_URI += "\ # http://errors.yoctoproject.org/Errors/Build/44914/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "0b77a2d9852d3aa8c8c21a68be8a1d6805197155" +SRCREV = "53a507b30befc40a4d06a1620e85bb4a5b1bf40a" diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index 6aa93567..f5b24c38 100644 --- a/recipes-qt/qt5/qtnetworkauth_git.bb +++ b/recipes-qt/qt5/qtnetworkauth_git.bb @@ -9,4 +9,4 @@ require qt5-git.inc DEPENDS += "qtbase" -SRCREV = "773a0dc64c73c1584fd1ed8fe081a9d9b1b1e4d5" +SRCREV = "ecdeaac31d2cdebda5d7b06a0224fd34649a7375" diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb index ad442ad9..d41dd51b 100644 --- a/recipes-qt/qt5/qtopcua_git.bb +++ b/recipes-qt/qt5/qtopcua_git.bb @@ -18,4 +18,4 @@ SECURITY_STRINGFORMAT = "" DEPENDS += "qtbase" -SRCREV = "3f51fb011ccb5cc3697f23477ecb7b65b75f5a1a" +SRCREV = "0e608b65ac435ce9d816543d5c8346059a650d55" diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index 2e94ebf9..2a709a96 100644 --- a/recipes-qt/qt5/qtpurchasing_git.bb +++ b/recipes-qt/qt5/qtpurchasing_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "acdb9438f7ae94b29bab9c261ec20e18ec80390d" +SRCREV = "ceb003e074cdbb6f2429dd3f4ddcf995382d199e" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 2be66ddc..cbcf1521 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtdeclarative-native" -SRCREV = "6a3356dfd8a98131d2912d16c666419d5eeaa10e" +SRCREV = "ed92154c712b0e54caa5baa72d832d7f8286307f" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index be706c79..fb5473d3 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb @@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \ ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ " -SRCREV = "b37db1f31b3248e9d32d0ccbb42e77035fa5b340" +SRCREV = "8f8d9b7015cd05e936d560f097cbce42eb375de9" diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index 3439e717..53461689 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb @@ -24,6 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "c76dfdc3eafe1d2129761951c3ca6970699badfb" +SRCREV = "76d6a13889514b03a1878e19b56eb1e6f17d1b90" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 5878ad59..6f9cc573 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -36,4 +36,4 @@ DEPENDS += "qtbase" # http://errors.yoctoproject.org/Errors/Build/44915/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "1701681e4f8ee3b17ca39f563a24065ee43b3a52" +SRCREV = "c2e02e863c3867f5d038731f429cc3a03f3cc3bc" diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index c07e7469..a0d84918 100644 --- a/recipes-qt/qt5/qtscxml_git.bb +++ b/recipes-qt/qt5/qtscxml_git.bb @@ -10,7 +10,7 @@ require qt5-git.inc DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" -SRCREV = "f416efc6e2ea2fff4357cd87f4458e009ac5d595" +SRCREV = "9ed16e4621ae705947d5e04ade450f1859ef86c5" # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12 # 5.12.meta-qt5.2 diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 65783ac6..03980659 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "b92ff799f71d0de7d6ba5b5dd59a6e50087c2f42" +SRCREV = "8fd13b71e50d0935af69e70f1961ac8194cb6fb3" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 9b9091eb..07ec5cd3 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtserialport" -SRCREV = "c8645af35accdfadfa2b29cd897f77b6e15704c8" +SRCREV = "4347caecbd0b2d02074a033eabf7d114ad7ca5f6" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index bfcab3a6..08b5e6a8 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "b1413c11b999aadca302c1b12dd90a12b55a1f12" +SRCREV = "f3bf6e0cc9c7b8c9d1ef249cf8043c465d7e8186" diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 4c5ea0b5..01f9f8a9 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "cd2d1245b8237aba4f64d8336b39e2635665564f" +SRCREV = "f8eb5228da5805161701477682489baf9d5028ea" diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 8ff05a4c..2fe1cbf3 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -32,7 +32,7 @@ EXTRA_QMAKEVARS_PRE += " \ ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ " -SRCREV = "911477d8da320db645db2b6b6180f1193ba7d36f" +SRCREV = "c4988ca21346752e601df8a6b2cef3ee10c062f0" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index dbbef411..6c648027 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb @@ -98,4 +98,4 @@ FILES_${PN}-qthelp = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ " -SRCREV = "00556e09790b83b3a2a83020b900e07829eaa0a4" +SRCREV = "d80d31a2d4bd94a4a97dd532a126f04d1a4dfc2d" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index c1dbca27..d67ccfae 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -71,4 +71,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" -SRCREV = "0ae9f37f9771f0b6536b28202e46c21d5995f13e" +SRCREV = "73259adb59f15dab266504f5444c99a6e06a7f32" diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 7131d1e3..8380585d 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -37,7 +37,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "2c9396b063ca03b36e03fbdb85853a410787313d" +SRCREV = "b28b121f05caba25da9544b31059832e0a492eef" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index a53c1883..eaf6aebe 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtwebsockets" -SRCREV = "8943eb70b12603f5136e83d285c01b7d50dbb2cf" +SRCREV = "77af92deffa9aeb8a5f85f1e73c3f110d24f7f40" diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 8f0b23be..1dd04b4d 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -176,8 +176,8 @@ SRC_URI_append_libc-musl = "\ file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "dbc0d09be2bbc3dce01ace956f534c4012402fba" -SRCREV_chromium = "7a779d0160771dcf6b4a644bc11137753c25982c" +SRCREV_qtwebengine = "636b32c7f22c96e9562270219cedca52d5203737" +SRCREV_chromium = "89644ad92fee38706430c1adb1e29b9756193b4f" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb index 13100384..49be04f7 100644 --- a/recipes-qt/qt5/qtwebglplugin_git.bb +++ b/recipes-qt/qt5/qtwebglplugin_git.bb @@ -18,4 +18,4 @@ do_configure_prepend() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" -SRCREV = "3581cde283545b907671d0cc42eeda6cbdeccb66" +SRCREV = "560f3c6f9a5e199f88be2f111e1ee5fa19948d57" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 084227df..80230099 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "465c6c3914455e8ed20f938e5d4a35e6decb446c" +SRCREV = "fd324911025d49b8b3d89a155ce38e3228edfd33" diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index ebabd163..6ebb55be 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb @@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)" COMPATIBLE_MACHINE_armv7ve = "(.*)" COMPATIBLE_MACHINE_aarch64 = "(.*)" -SRCREV = "57f656a964aa9fdeb966d14eddc39f62a989b86b" +SRCREV = "bc7e946f0e823be99de7834a2784c22d5ae2d628" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index abec0c1b..c9e761ba 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "35ae66f89959e1dd98648cc4033e153e1e5240b4" +SRCREV = "547506f904a2ba72d56c2c61c2c24adea91bdd25" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 0c8daed0..542fa6cb 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -25,7 +25,7 @@ do_configure_prepend() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" -SRCREV = "cdf3aa96879b7f5f0bd9bec9d1bd8dd624beee28" +SRCREV = "e74c6fee102c228da060f3899610e4449bc1851a" BBCLASSEXTEND =+ "native nativesdk" |