From 3208763b8b3f65b17825ded4b2c9b9166d78f2b2 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 28 May 2015 14:52:48 +0200 Subject: [PATCH] qt5: rename -git directories with patches to just Signed-off-by: Martin Jansa --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 3 --- recipes-qt/qt5/nativesdk-qttools_git.bb | 3 --- recipes-qt/qt5/qt5-git.inc | 2 -- .../{qtbase-git => qtbase}/0001-Add-linux-oe-g-platform.patch | 0 ...-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch | 0 .../0003-Add-external-hostbindir-option.patch | 0 ...0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch | 0 ...05-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch | 0 ...-qeglplatformintegration-Undefine-CursorShape-from-X..patch | 0 ...-configure-bump-path-length-from-256-to-512-character.patch | 0 ...-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch | 0 .../0009-QOpenGLPaintDevice-sub-area-support.patch | 0 ...-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch | 0 .../qt5/{qtbase-git => qtbase}/0011-Always-build-uic.patch | 0 ...-qmake-don-t-build-it-in-configure-but-allow-to-build.patch | 0 .../0012-Add-external-hostbindir-option-for-native-sdk.patch | 0 .../0012-Set-paths-for-target-properly.patch | 0 ...-configure-preserve-built-qmake-and-swap-with-native-.patch | 0 recipes-qt/qt5/{qtbase-git => qtbase}/OEQt5Toolchain.cmake | 0 .../0001-qmltestexample-fix-link.patch | 0 .../0001-Initial-porting-effort-to-GStreamer-1.0.patch | 0 .../0001-Unix-Clear-serial_struct-instances.patch | 0 .../0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch | 0 ...002-assistant-help-fix-linking-of-dependent-libraries.patch | 0 .../0003-add-noqtwebkit-configuration.patch | 0 ...-Install-the-qtwaylandscanner-tool-to-the-native-side.patch | 0 ...-examples-wayland-include-server-buffer-only-when-bui.patch | 0 ...-chromium-base.gypi-include-atomicops_internals_x86_g.patch | 0 ...-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch | 0 ...-functions.prf-Make-sure-we-only-use-the-file-name-to.patch | 0 ...003-functions.prf-allow-build-for-linux-oe-g-platform.patch | 0 .../0001-qtwebkit-fix-QA-issue-bad-RPATH.patch | 0 .../0002-Remove-TEXTREL-tag-in-x86.patch | 0 33 files changed, 8 deletions(-) rename recipes-qt/qt5/{qtbase-git => qtbase}/0001-Add-linux-oe-g-platform.patch (100%) rename recipes-qt/qt5/{qtbase-git => qtbase}/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch (100%) rename recipes-qt/qt5/{qtbase-git => qtbase}/0003-Add-external-hostbindir-option.patch (100%) rename recipes-qt/qt5/{qtbase-git => qtbase}/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch (100%) rename recipes-qt/qt5/{qtbase-git => qtbase}/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch (100%) rename recipes-qt/qt5/{qtbase-git => qtbase}/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch (100%) rename recipes-qt/qt5/{qtbase-git => qtbase}/0007-configure-bump-path-length-from-256-to-512-character.patch (100%) rename recipes-qt/qt5/{qtbase-git => qtbase}/0008-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch (100%) rename recipes-qt/qt5/{qtbase-git => qtbase}/0009-QOpenGLPaintDevice-sub-area-support.patch (100%) rename recipes-qt/qt5/{qtbase-git => qtbase}/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch (100%) rename recipes-qt/qt5/{qtbase-git => qtbase}/0011-Always-build-uic.patch (100%) rename recipes-qt/qt5/{qtbase-git => qtbase}/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch (100%) rename recipes-qt/qt5/{qtbase-git => qtbase}/0012-Add-external-hostbindir-option-for-native-sdk.patch (100%) rename recipes-qt/qt5/{qtbase-git => qtbase}/0012-Set-paths-for-target-properly.patch (100%) rename recipes-qt/qt5/{qtbase-git => qtbase}/0013-configure-preserve-built-qmake-and-swap-with-native-.patch (100%) rename recipes-qt/qt5/{qtbase-git => qtbase}/OEQt5Toolchain.cmake (100%) rename recipes-qt/qt5/{qtdeclarative-git => qtdeclarative}/0001-qmltestexample-fix-link.patch (100%) rename recipes-qt/qt5/{qtmultimedia-git => qtmultimedia}/0001-Initial-porting-effort-to-GStreamer-1.0.patch (100%) rename recipes-qt/qt5/{qtserialport-git => qtserialport}/0001-Unix-Clear-serial_struct-instances.patch (100%) rename recipes-qt/qt5/{qttools-git => qttools}/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch (100%) rename recipes-qt/qt5/{qttools-git => qttools}/0002-assistant-help-fix-linking-of-dependent-libraries.patch (100%) rename recipes-qt/qt5/{qttools-git => qttools}/0003-add-noqtwebkit-configuration.patch (100%) rename recipes-qt/qt5/{qtwayland-git => qtwayland}/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch (100%) rename recipes-qt/qt5/{qtwayland-git => qtwayland}/0001-examples-wayland-include-server-buffer-only-when-bui.patch (100%) rename recipes-qt/qt5/{qtwebengine-git => qtwebengine}/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch (100%) rename recipes-qt/qt5/{qtwebengine-git => qtwebengine}/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch (100%) rename recipes-qt/qt5/{qtwebengine-git => qtwebengine}/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch (100%) rename recipes-qt/qt5/{qtwebengine-git => qtwebengine}/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch (100%) rename recipes-qt/qt5/{qtwebkit-git => qtwebkit}/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch (100%) rename recipes-qt/qt5/{qtwebkit-git => qtwebkit}/0002-Remove-TEXTREL-tag-in-x86.patch (100%) diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index b120733..1b566c2 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -1,9 +1,6 @@ require qt5-git.inc require ${PN}.inc -# prepend this again, because ${PN}.inc prepneds ${PN} -FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:" - SRC_URI = "\ ${QT_GIT}/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \ " diff --git a/recipes-qt/qt5/nativesdk-qttools_git.bb b/recipes-qt/qt5/nativesdk-qttools_git.bb index 7ce1747..bbaafc5 100644 --- a/recipes-qt/qt5/nativesdk-qttools_git.bb +++ b/recipes-qt/qt5/nativesdk-qttools_git.bb @@ -1,9 +1,6 @@ require qt5-git.inc require ${PN}.inc -# prepend this again, because ${PN}.inc prepends ${PN} -FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:" - SRCREV = "7f5b11a4a6357d2969e5b24bfb25c47aeb3d99f5" LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=d87ae0d200af76dca730d911474cbe5b \ diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index e90256e..f25de9b 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc @@ -12,8 +12,6 @@ S = "${WORKDIR}/git" PV = "5.4.1+git${SRCPV}" -FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:" - DEFAULT_PREFERENCE = "-1" LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)" diff --git a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch similarity index 100% rename from recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch rename to recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch diff --git a/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch similarity index 100% rename from recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch rename to recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch diff --git a/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch similarity index 100% rename from recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch rename to recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch diff --git a/recipes-qt/qt5/qtbase-git/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch b/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch similarity index 100% rename from recipes-qt/qt5/qtbase-git/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch rename to recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch diff --git a/recipes-qt/qt5/qtbase-git/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch b/recipes-qt/qt5/qtbase/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch similarity index 100% rename from recipes-qt/qt5/qtbase-git/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch rename to recipes-qt/qt5/qtbase/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch diff --git a/recipes-qt/qt5/qtbase-git/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch b/recipes-qt/qt5/qtbase/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch similarity index 100% rename from recipes-qt/qt5/qtbase-git/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch rename to recipes-qt/qt5/qtbase/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch diff --git a/recipes-qt/qt5/qtbase-git/0007-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0007-configure-bump-path-length-from-256-to-512-character.patch similarity index 100% rename from recipes-qt/qt5/qtbase-git/0007-configure-bump-path-length-from-256-to-512-character.patch rename to recipes-qt/qt5/qtbase/0007-configure-bump-path-length-from-256-to-512-character.patch diff --git a/recipes-qt/qt5/qtbase-git/0008-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch b/recipes-qt/qt5/qtbase/0008-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch similarity index 100% rename from recipes-qt/qt5/qtbase-git/0008-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch rename to recipes-qt/qt5/qtbase/0008-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch diff --git a/recipes-qt/qt5/qtbase-git/0009-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase/0009-QOpenGLPaintDevice-sub-area-support.patch similarity index 100% rename from recipes-qt/qt5/qtbase-git/0009-QOpenGLPaintDevice-sub-area-support.patch rename to recipes-qt/qt5/qtbase/0009-QOpenGLPaintDevice-sub-area-support.patch diff --git a/recipes-qt/qt5/qtbase-git/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch b/recipes-qt/qt5/qtbase/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch similarity index 100% rename from recipes-qt/qt5/qtbase-git/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch rename to recipes-qt/qt5/qtbase/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch diff --git a/recipes-qt/qt5/qtbase-git/0011-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0011-Always-build-uic.patch similarity index 100% rename from recipes-qt/qt5/qtbase-git/0011-Always-build-uic.patch rename to recipes-qt/qt5/qtbase/0011-Always-build-uic.patch diff --git a/recipes-qt/qt5/qtbase-git/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch b/recipes-qt/qt5/qtbase/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch similarity index 100% rename from recipes-qt/qt5/qtbase-git/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch rename to recipes-qt/qt5/qtbase/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch diff --git a/recipes-qt/qt5/qtbase-git/0012-Add-external-hostbindir-option-for-native-sdk.patch b/recipes-qt/qt5/qtbase/0012-Add-external-hostbindir-option-for-native-sdk.patch similarity index 100% rename from recipes-qt/qt5/qtbase-git/0012-Add-external-hostbindir-option-for-native-sdk.patch rename to recipes-qt/qt5/qtbase/0012-Add-external-hostbindir-option-for-native-sdk.patch diff --git a/recipes-qt/qt5/qtbase-git/0012-Set-paths-for-target-properly.patch b/recipes-qt/qt5/qtbase/0012-Set-paths-for-target-properly.patch similarity index 100% rename from recipes-qt/qt5/qtbase-git/0012-Set-paths-for-target-properly.patch rename to recipes-qt/qt5/qtbase/0012-Set-paths-for-target-properly.patch diff --git a/recipes-qt/qt5/qtbase-git/0013-configure-preserve-built-qmake-and-swap-with-native-.patch b/recipes-qt/qt5/qtbase/0013-configure-preserve-built-qmake-and-swap-with-native-.patch similarity index 100% rename from recipes-qt/qt5/qtbase-git/0013-configure-preserve-built-qmake-and-swap-with-native-.patch rename to recipes-qt/qt5/qtbase/0013-configure-preserve-built-qmake-and-swap-with-native-.patch diff --git a/recipes-qt/qt5/qtbase-git/OEQt5Toolchain.cmake b/recipes-qt/qt5/qtbase/OEQt5Toolchain.cmake similarity index 100% rename from recipes-qt/qt5/qtbase-git/OEQt5Toolchain.cmake rename to recipes-qt/qt5/qtbase/OEQt5Toolchain.cmake diff --git a/recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch similarity index 100% rename from recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch rename to recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch diff --git a/recipes-qt/qt5/qtmultimedia-git/0001-Initial-porting-effort-to-GStreamer-1.0.patch b/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch similarity index 100% rename from recipes-qt/qt5/qtmultimedia-git/0001-Initial-porting-effort-to-GStreamer-1.0.patch rename to recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch diff --git a/recipes-qt/qt5/qtserialport-git/0001-Unix-Clear-serial_struct-instances.patch b/recipes-qt/qt5/qtserialport/0001-Unix-Clear-serial_struct-instances.patch similarity index 100% rename from recipes-qt/qt5/qtserialport-git/0001-Unix-Clear-serial_struct-instances.patch rename to recipes-qt/qt5/qtserialport/0001-Unix-Clear-serial_struct-instances.patch diff --git a/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch similarity index 100% rename from recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch rename to recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch diff --git a/recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch b/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch similarity index 100% rename from recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch rename to recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch diff --git a/recipes-qt/qt5/qttools-git/0003-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch similarity index 100% rename from recipes-qt/qt5/qttools-git/0003-add-noqtwebkit-configuration.patch rename to recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch diff --git a/recipes-qt/qt5/qtwayland-git/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch b/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch similarity index 100% rename from recipes-qt/qt5/qtwayland-git/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch rename to recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch diff --git a/recipes-qt/qt5/qtwayland-git/0001-examples-wayland-include-server-buffer-only-when-bui.patch b/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch similarity index 100% rename from recipes-qt/qt5/qtwayland-git/0001-examples-wayland-include-server-buffer-only-when-bui.patch rename to recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch diff --git a/recipes-qt/qt5/qtwebengine-git/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch b/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch similarity index 100% rename from recipes-qt/qt5/qtwebengine-git/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch rename to recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch diff --git a/recipes-qt/qt5/qtwebengine-git/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch b/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch similarity index 100% rename from recipes-qt/qt5/qtwebengine-git/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch rename to recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch diff --git a/recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch b/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch similarity index 100% rename from recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch rename to recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch diff --git a/recipes-qt/qt5/qtwebengine-git/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch b/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch similarity index 100% rename from recipes-qt/qt5/qtwebengine-git/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch rename to recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch diff --git a/recipes-qt/qt5/qtwebkit-git/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch b/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch similarity index 100% rename from recipes-qt/qt5/qtwebkit-git/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch rename to recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch diff --git a/recipes-qt/qt5/qtwebkit-git/0002-Remove-TEXTREL-tag-in-x86.patch b/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch similarity index 100% rename from recipes-qt/qt5/qtwebkit-git/0002-Remove-TEXTREL-tag-in-x86.patch rename to recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch