diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-04-26 09:23:02 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-03-24 11:13:28 +0100 |
commit | e45f3d305e25ff2aef9e42697e583e6f69a9b6e6 (patch) | |
tree | 0bf698ed62d258d6e05d5a3129dea2e52b2d2121 /meta/recipes-webos/qt-features-webos | |
parent | c44fc9b620f762ce68441f834e1a157288a488e6 (diff) | |
download | openembedded-core-contrib-e45f3d305e25ff2aef9e42697e583e6f69a9b6e6.tar.gz |
meta-webosose: import recipes which often reproduce Yocto #12434
* just temporary to make it easier to reproduce, import big part of meta-webosose
and some recipes from meta-oe
* luna-init: /luna-init-fonts/usr/share/fonts/PreludeCompWGL-Light.ttf is owned by uid 1001, which is the same as the user running bitbake. This may be due to host contamination
* qml-webos-framework: /qml-webos-framework/usr/share/dbus-1/system-services/com.webos.qml-app.service is owned by uid 1101, which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated]
* to reproduce this you can try to use something like this:
export COMP=luna-init; for i in `seq -w 1 999`; do echo $i; bitbake -v -v -DDDD -f -c package ${COMP} 2>${COMP}-logerr.$i >${COMP}-log.$i; bitbake -v -v -DDDD -f -c package_qa ${COMP} 2>${COMP}-logerr.qa.$i >${COMP}-log.qa.$i || { cp -ra BUILD/work/i586-oe-linux/${COMP}/ ${COMP}-workdir-$i; bitbake -c cleansstate ${COMP} ; } done
export COMP=qml-webos-framework; for i in `seq -w 1 999`; do echo $i; bitbake -v -v -DDDD -f -c package ${COMP} 2>${COMP}-logerr.$i >${COMP}-log.$i; bitbake -v -v -DDDD -f -c package_qa ${COMP} 2>${COMP}-logerr.qa.$i >${COMP}-log.qa.$i || { cp -ra BUILD/work/i586-oe-linux/${COMP}/ ${COMP}-workdir-$i; bitbake -c cleansstate ${COMP} ; } done
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta/recipes-webos/qt-features-webos')
-rw-r--r-- | meta/recipes-webos/qt-features-webos/qt-features-webos.bb | 36 | ||||
-rw-r--r-- | meta/recipes-webos/qt-features-webos/qt-features-webos/qt.patch | 76 |
2 files changed, 112 insertions, 0 deletions
diff --git a/meta/recipes-webos/qt-features-webos/qt-features-webos.bb b/meta/recipes-webos/qt-features-webos/qt-features-webos.bb new file mode 100644 index 0000000000..984ba7dc25 --- /dev/null +++ b/meta/recipes-webos/qt-features-webos/qt-features-webos.bb @@ -0,0 +1,36 @@ +# Copyright (c) 2013-2018 LG Electronics, Inc. + +SUMMARY = "Common Qt features for webOS components" +AUTHOR = "Anupam Kaul <anulam.kaul@lge.com>" +SECTION = "webos/base" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +DEPENDS = "qtbase" + +WEBOS_VERSION = "1.0.0-1_67a99fc04d01e3025d137f7d50b0aa15016c4525" +PR = "r4" + +inherit webos_qmake5 +inherit webos_enhanced_submissions +inherit webos_public_repo + +SRC_URI = "${WEBOSOSE_GIT_REPO_COMPLETE}" +S = "${WORKDIR}/git" + +SRC_URI += "file://qt.patch" + +FILES_${PN}-dev += "${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs" + +# An empty package is needed to satisfy package dependencies when building bdk. +ALLOW_EMPTY_${PN} = "1" + +BBCLASSEXTEND = "native" + +do_configure_class-native() { + ${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S}/tools/generate_qmap +} + +do_install_class-native() { + oe_runmake install INSTALL_ROOT=${D} +} diff --git a/meta/recipes-webos/qt-features-webos/qt-features-webos/qt.patch b/meta/recipes-webos/qt-features-webos/qt-features-webos/qt.patch new file mode 100644 index 0000000000..35749a7c1f --- /dev/null +++ b/meta/recipes-webos/qt-features-webos/qt-features-webos/qt.patch @@ -0,0 +1,76 @@ +--- + tools/generate_qmap/generate_qmap.cpp | 35 +++++++++++++++++++++++++++++++---- + tools/generate_qmap/generate_qmap.pro | 2 +- + 2 files changed, 32 insertions(+), 5 deletions(-) + +diff --git a/tools/generate_qmap/generate_qmap.cpp b/tools/generate_qmap/generate_qmap.cpp +index 0ec03d1..2df5834 100644 +--- a/tools/generate_qmap/generate_qmap.cpp ++++ b/tools/generate_qmap/generate_qmap.cpp +@@ -18,7 +18,35 @@ + #include <QDataStream> + #include <QDebug> + +-#include <QtPlatformSupport/private/qevdevkeyboardhandler_p.h> ++namespace QEvdevKeyboardMap { ++ const quint32 FileMagic = 0x514d4150; // 'QMAP' ++ ++ struct Mapping { ++ quint16 keycode; ++ quint16 unicode; ++ quint32 qtcode; ++ quint8 modifiers; ++ quint8 flags; ++ quint16 special; ++ ++ }; ++ ++ struct Composing { ++ quint16 first; ++ quint16 second; ++ quint16 result; ++ }; ++} ++ ++inline QDataStream &operator<<(QDataStream &ds, const QEvdevKeyboardMap::Mapping &m) ++{ ++ return ds << m.keycode << m.unicode << m.qtcode << m.modifiers << m.flags << m.special; ++} ++ ++inline QDataStream &operator<<(QDataStream &ds, const QEvdevKeyboardMap::Composing &c) ++{ ++ return ds << c.first << c.second << c.result; ++} + + //HACK : to use evdev default keymap which is private static variable + //Change to the class name for local usage QEvdevKeyboardHandler -> WebOSKeymapHandler +@@ -26,11 +54,10 @@ + class WebOSKeymapHandler + { + public: +- static const QEvdevKeyboardMap::Mapping s_keymap_default[]; +- static const QEvdevKeyboardMap::Composing s_keycompose_default[]; ++ static const QEvdevKeyboardMap::Mapping s_keymap_default[0]; ++ static const QEvdevKeyboardMap::Composing s_keycompose_default[0]; + }; + #define QEvdevKeyboardHandler WebOSKeymapHandler +-#include <QtPlatformSupport/private/qevdevkeyboard_defaultmap_p.h> + + #include "webos_keymap_p.h" + +diff --git a/tools/generate_qmap/generate_qmap.pro b/tools/generate_qmap/generate_qmap.pro +index 0825651..4d84906 100644 +--- a/tools/generate_qmap/generate_qmap.pro ++++ b/tools/generate_qmap/generate_qmap.pro +@@ -20,7 +20,7 @@ CONFIG += no_module_headers internal_module + + TARGET = generate_qmap + CONFIG += console warn_off +-QT = core platformsupport-private ++QT = core + + SOURCES += generate_qmap.cpp + +-- +1.9.1 + |