On 1/28/2025 6:14 PM, [email protected] wrote:
From: Randolph Sapp <[email protected]>
Remove all the Qt5 specific configs, recipes, and package groups to
prepare for Qt6. Some of these package configs will still work, but they
are unecessary.
All of the conditional logic in meta-qt6 toggles the important flags
automatically for us right now. This behavior will only change if X11 is
enabled, which we currently disable.
Signed-off-by: Randolph Sapp <[email protected]>
---
meta-arago-distro/README | 4 -
meta-arago-distro/conf/distro/arago.conf | 24 --
meta-arago-distro/conf/layer.conf | 2 -
.../images/tisdk-default-image.bb | 1 -
.../meta/meta-toolchain-arago-qte.bb | 54 ----
.../meta/meta-toolchain-arago-tisdk.bb | 2 +-
.../packagegroups/packagegroup-arago-qte.bb | 26 --
.../packagegroup-arago-tisdk-qte.bb | 21 --
...ckagegroup-arago-toolchain-tisdk-target.bb | 1 -
.../recipes-core/packagegroups/ti-world.bb | 1 -
.../qt5/qtbase-conf/eglfs_kms_cfg.json | 5 -
.../recipes-qt/qt5/qtbase-conf/qt_env.sh | 16 -
.../qt5/qtbase-conf/ti33x/qt_env.sh | 14 -
.../recipes-qt/qt5/qtbase-conf_1.0.bb | 23 --
...xit-button-for-non-window-environmen.patch | 62 ----
...01-deform-Fix-how-controls-are-shown.patch | 35 ---
...fs-Force-888-format-only-on-env-flag.patch | 44 ---
...latforms-eglfs_kms-fix-compiler-erro.patch | 29 --
...d-exit-button-for-non-window-environ.patch | 83 ------
.../0002-deform-disable-opengl-button.patch | 73 -----
.../recipes-qt/qt5/qtbase/quit.png | Bin 645 -> 0 bytes
.../recipes-qt/qt5/qtbase_%.bbappend | 46 ---
...touchinteraction.qml-Add-exit-button.patch | 62 ----
.../recipes-qt/qt5/qtdeclarative_git.bbappend | 10 -
...atform.h-add-define-MESA_EGL_NO_X11_.patch | 30 --
...e-to-use-GL_NoX-version-of-GraphicsS.patch | 31 --
.../qtwebkit/GraphicsContext3DQt.cpp.patch | 29 --
.../qtwebkit/GraphicsSurfaceGL_NoX.cpp.patch | 273 ------------------
.../qt5/qtwebkit/GraphicsSurfaceToken.h.patch | 36 ---
.../recipes-qt/qt5/qtwebkit/WebCore.pri.patch | 20 --
.../qt5/qtwebkit/qttestbrowser.cpp.patch | 27 --
.../recipes-qt/qt5/qtwebkit_%.bbappend | 18 --
meta-arago-extras/README | 4 -
...k-packagegroup-arago-qte-toolchain-host.bb | 12 -
...packagegroup-arago-qte-toolchain-target.bb | 35 ---
.../cmake/extra-cmake-modules.bb | 1 -
..._QMAKE_PATH_EXTERNAL_HOST_BINS-for-q.patch | 28 --
37 files changed, 1 insertion(+), 1181 deletions(-)
delete mode 100644
meta-arago-distro/recipes-core/meta/meta-toolchain-arago-qte.bb
delete mode 100644
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb
delete mode 100644
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb
delete mode 100644
meta-arago-distro/recipes-qt/qt5/qtbase-conf/eglfs_kms_cfg.json
delete mode 100644 meta-arago-distro/recipes-qt/qt5/qtbase-conf/qt_env.sh
delete mode 100644
meta-arago-distro/recipes-qt/qt5/qtbase-conf/ti33x/qt_env.sh
delete mode 100644 meta-arago-distro/recipes-qt/qt5/qtbase-conf_1.0.bb
delete mode 100644
meta-arago-distro/recipes-qt/qt5/qtbase/0001-calculator-Add-exit-button-for-non-window-environmen.patch
delete mode 100644
meta-arago-distro/recipes-qt/qt5/qtbase/0001-deform-Fix-how-controls-are-shown.patch
delete mode 100644
meta-arago-distro/recipes-qt/qt5/qtbase/0001-eglfs-Force-888-format-only-on-env-flag.patch
delete mode 100644
meta-arago-distro/recipes-qt/qt5/qtbase/0001-qtbase-plugins-platforms-eglfs_kms-fix-compiler-erro.patch
delete mode 100644
meta-arago-distro/recipes-qt/qt5/qtbase/0002-animatedtiles-Add-exit-button-for-non-window-environ.patch
delete mode 100644
meta-arago-distro/recipes-qt/qt5/qtbase/0002-deform-disable-opengl-button.patch
delete mode 100755 meta-arago-distro/recipes-qt/qt5/qtbase/quit.png
delete mode 100644 meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend
delete mode 100644
meta-arago-distro/recipes-qt/qt5/qtdeclarative/0001-touchinteraction.qml-Add-exit-button.patch
delete mode 100644 meta-arago-distro/recipes-qt/qt5/qtdeclarative_git.bbappend
delete mode 100644
meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch
delete mode 100644
meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-Target.pri-update-to-use-GL_NoX-version-of-GraphicsS.patch
delete mode 100644
meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsContext3DQt.cpp.patch
delete mode 100644
meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceGL_NoX.cpp.patch
delete mode 100644
meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceToken.h.patch
delete mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/WebCore.pri.patch
delete mode 100644
meta-arago-distro/recipes-qt/qt5/qtwebkit/qttestbrowser.cpp.patch
delete mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend
delete mode 100644
meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-qte-toolchain-host.bb
delete mode 100644
meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb
delete mode 100644
meta-arago-extras/recipes-devtools/cmake/extra-cmake-modules/0001-Search-within-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-for-q.patch
*snip*
diff --git a/meta-arago-distro/recipes-core/meta/meta-toolchain-arago-tisdk.bb
b/meta-arago-distro/recipes-core/meta/meta-toolchain-arago-tisdk.bb
index 4f272a52..80e2882b 100644
--- a/meta-arago-distro/recipes-core/meta/meta-toolchain-arago-tisdk.bb
+++ b/meta-arago-distro/recipes-core/meta/meta-toolchain-arago-tisdk.bb
@@ -1,6 +1,6 @@
TOOLCHAIN_SUFFIX ?= "-tisdk"
+LICENSE = "MIT"
require meta-toolchain-arago-tisdk.inc
-require recipes-core/meta/meta-toolchain-arago-qte.bb
PR = "${INC_PR}.0"
This is causing the series to not build. I'm getting this error:
Initialising tasks...ERROR: Task do_populate_sdk in
/scratch/jenkins_builds/arago-master-wip/build/sources/meta-arago/meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb
depends upon non-existent task do_populate_sdk in
/scratch/jenkins_builds/arago-master-wip/build/sources/meta-arago/meta-arago-distro/recipes-core/meta/meta-toolchain-arago-tisdk.bb
ERROR: Command execution failed: 1
The issue is that you removed the require on
meta-toolchain-arago-qte.bb, BUT that recipe had a require on
meta-toolchain-arago.bb.
So you need to replace the above require with:
require meta-toolchain-arago.bb
I'm surprised you didn't run into this while testing... Maybe it
requires building ti-world to see it?
--
Ryan Eatmon [email protected]
-----------------------------------------
Texas Instruments, Inc. - LCPD - MGTS
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#15793):
https://lists.yoctoproject.org/g/meta-arago/message/15793
Mute This Topic: https://lists.yoctoproject.org/mt/110870217/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-arago/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
