Skip to contentSkip to conversation

FIXME: packagegroups, matrix: switch k3 from qtwebkit to qtwebengine

PATCH New Denys Dmytriyenko 1 participant 2 messages Feb 13, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 FIXME: packagegroups, matrix: switch k3 from qtwebkit to qtwebengine

The new Arm toolchain fails to build qtwebkit for now.
https://bugs.linaro.org/show_bug.cgi?id=4284

---
 .../recipes-core/packagegroups/packagegroup-arago-qte.bb | 12 ++++++------
 .../packagegroups/packagegroup-arago-tisdk-matrix.bb     |  8 ++++----
 .../packagegroups/packagegroup-arago-tisdk-qte.bb        | 12 ++++++------
 .../recipes-core/matrix/matrix-gui-browser_2.0.bb        |  6 +++---
 .../packagegroup-arago-qte-toolchain-target.bb           | 16 ++++++++--------
 5 files changed, 27 insertions(+), 27 deletions(-)
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb +6 -6
index c038a16..992b0b7 100644
@@ -46,12 +46,12 @@ QT5_ESSENTIALS = "\
     qtconnectivity-qmlplugins \
 "
 
-QT5_ESSENTIALS_append_k3 = "\
-    qtwebkit-qmlplugins \
-"
-QT5_ESSENTIALS_remove_k3 = "\
-    qtwebengine-qmlplugins \
-"
+#QT5_ESSENTIALS_append_k3 = "\
+#    qtwebkit-qmlplugins \
+#"
+#QT5_ESSENTIALS_remove_k3 = "\
+#    qtwebengine-qmlplugins \
+#"
 
 RDEPENDS_${PN} = "\
     ${@oe.utils.conditional('QT_PROVIDER', 'qt5', "${QT5_ESSENTIALS}", "${QT4_ESSENTIALS}", d)} \
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb +4 -4
index 101fb0b..3db7c3f 100644
@@ -45,10 +45,10 @@ MATRIX_TOUCH_APPS = " \
 
 MATRIX_QT_APPS_keystone = ""
 MATRIX_QT_APPS_omapl138 = ""
-MATRIX_QT_APPS_remove_k3 = "matrix-qt5-demo-browser"
-MATRIX_QT_APPS_append_k3 = " \
-    matrix-qt5-demo-webkit-browser \
-"
+#MATRIX_QT_APPS_remove_k3 = "matrix-qt5-demo-browser"
+#MATRIX_QT_APPS_append_k3 = " \
+#    matrix-qt5-demo-webkit-browser \
+#"
 
 MATRIX_SGX_DEMOS = " \
     matrix-3d-demo-chameleon \
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb +6 -6
index 43a0d02..36cfca9 100644
@@ -28,13 +28,13 @@ QT5_DEMOS = "\
     qtserialport-examples \
 "
 
-QT5_DEMOS_append_k3 = " qtwebkit-examples-examples"
+#QT5_DEMOS_append_k3 = " qtwebkit-examples-examples"
 
-QT5_DEMOS_remove_k3 = "\
-    qtwebbrowser \
-    qtwebbrowser-examples \
-    qtwebengine-examples \
-"
+#QT5_DEMOS_remove_k3 = "\
+#    qtwebbrowser \
+#    qtwebbrowser-examples \
+#    qtwebengine-examples \
+#"
 
 QT_DEMOS = "\
     qt-tstat \
meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb +3 -3
index 9ceaa56..9635429 100644
@@ -10,14 +10,14 @@ inherit qt-provider
 RDEPENDS_${PN} += "${QT_RDEPENDS_FONTS}"
 
 DEPENDS += "${QT_DEPENDS_WEBENGINE}"
-DEPENDS_k3 += "${QT_DEPENDS_WEBKIT}"
-DEPENDS_remove_k3 = "${QT_DEPENDS_WEBENGINE}"
+#DEPENDS_k3 += "${QT_DEPENDS_WEBKIT}"
+#DEPENDS_remove_k3 = "${QT_DEPENDS_WEBENGINE}"
 
 PR = "r16"
 
 QT4_SRCREV = "83019b46fb3dec1a12667d251d35ba8682953a79"
 QT5_SRCREV = "d3ecf8d0dff3e4f901d588ea0dfe485733dfc9dc"
-QT5_SRCREV_k3 = "78ad5db716d1abc4c05abfe435f066b6b88454d5"
+#QT5_SRCREV_k3 = "78ad5db716d1abc4c05abfe435f066b6b88454d5"
 
 
 SRCREV = "${@oe.utils.conditional('QT_PROVIDER', 'qt5', "${QT5_SRCREV}", "${QT4_SRCREV}", d)}"
meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb +8 -8
index 2afc974..5add6f9 100644
@@ -67,15 +67,15 @@ QT5_DEV = " \
         qtserialport-dev  \
 "
 
-QT5_DEV_append_k3 = " \
-        qtwebkit-mkspecs \
-        qtwebkit-dev \
-"
+#QT5_DEV_append_k3 = " \
+#        qtwebkit-mkspecs \
+#        qtwebkit-dev \
+#"
 
-QT5_DEV_remove_k3 = " \
-        qtwebengine-mkspecs \
-        qtwebengine-dev \
-"
+#QT5_DEV_remove_k3 = " \
+#        qtwebengine-mkspecs \
+#        qtwebengine-dev \
+#"
 
 RDEPENDS_${PN} += " \
         ${@oe.utils.conditional('QT_PROVIDER', 'qt5', "${QT5_DEV}", "${QT4_DEV}", d)} \
Signature · 1 line
2.7.4
#1 lore raw

PATCH 2/2 arago.conf: bump distro version

---
 meta-arago-distro/conf/distro/arago.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-arago-distro/conf/distro/arago.conf +1 -1
index cd56b47..b8240de 100644
@@ -1,6 +1,6 @@
 # Name and version of the distribution
 DISTRO_NAME = "Arago"
-DISTRO_VERSION = "2018.12"
+DISTRO_VERSION = "2019.02"
 DISTRO_FEED_URI ?= "http://lcpd.gt.design.ti.com"
 BUILD_VARIANT = "${@['prod','rt','systest'][int(d.getVar('ARAGO_RT_ENABLE'))+int(d.getVar('ARAGO_SYSTEST_ENABLE'))*2]}"
 FEEDURIPREFIX ?= "packages/${DISTRO}-master/${BUILD_VARIANT}/"
Signature · 1 line
2.7.4