From 4015598f018d0ce3df20245a7809c4d383778384 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Tue, 24 Sep 2019 12:32:55 +0300
Subject: [PATCH] Move oe-device-extra.pri content to dynamic layers
Instead of using separate files for each target, append
oe-device-extra.pri content in each dynamic layer recipe.
Remove all old targets that are no longer supported.
Change-Id: If1a70fa95c7128e8b7d39cf38470f1f9283af78c
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
---
.../conf/distro/include/boundary.inc | 1 +
.../recipes-qt/qt5/qtbase_git.bbappend | 38 +++++++++++++++++++
.../intel/recipes-qt/default-qt-envs.bbappend | 2 -
.../intel/recipes-qt/qt5/qtbase_git.bbappend | 2 +
.../recipes-qt/qt5/qtbase_git.bbappend | 30 +++++++++++++++
.../tegra/recipes-qt/qt5/qtbase_git.bbappend | 4 +-
.../intel-corei7-64/oe-device-extra.pri | 10 -----
.../qt5/qtbase/jetson-tx1/oe-device-extra.pri | 4 --
.../qt5/qtbase/jetson-tx2/oe-device-extra.pri | 4 --
.../qt5/qtbase/mx6/oe-device-extra.pri | 10 -----
.../qt5/qtbase/mx6ull/oe-device-extra.pri | 2 -
.../qt5/qtbase/mx8/oe-device-extra.pri | 5 ---
.../qtbase/nvidia-logan/oe-device-extra.pri | 11 ------
.../recipes-qt/qt5/qtbase/oe-device-extra.pri | 3 --
.../qt5/qtbase/rpi/oe-device-extra.pri | 11 ------
.../qt5/qtbase/ti33x/oe-device-extra.pri | 6 ---
.../recipes-qt/qt5/qtbase_git.bbappend | 13 +++++--
.../boot2qt-addons}/default-qt-envs/kms.conf | 0
18 files changed, 83 insertions(+), 73 deletions(-)
create mode 100644 meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-qt/qt5/qtbase_git.bbappend
create mode 100644 meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/qt5/qtbase_git.bbappend
delete mode 100644 meta-boot2qt-distro/recipes-qt/qt5/qtbase/intel-corei7-64/oe-device-extra.pri
delete mode 100644 meta-boot2qt-distro/recipes-qt/qt5/qtbase/jetson-tx1/oe-device-extra.pri
delete mode 100644 meta-boot2qt-distro/recipes-qt/qt5/qtbase/jetson-tx2/oe-device-extra.pri
delete mode 100644 meta-boot2qt-distro/recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri
delete mode 100644 meta-boot2qt-distro/recipes-qt/qt5/qtbase/mx6ull/oe-device-extra.pri
delete mode 100644 meta-boot2qt-distro/recipes-qt/qt5/qtbase/mx8/oe-device-extra.pri
delete mode 100644 meta-boot2qt-distro/recipes-qt/qt5/qtbase/nvidia-logan/oe-device-extra.pri
delete mode 100644 meta-boot2qt-distro/recipes-qt/qt5/qtbase/oe-device-extra.pri
delete mode 100644 meta-boot2qt-distro/recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri
delete mode 100644 meta-boot2qt-distro/recipes-qt/qt5/qtbase/ti33x/oe-device-extra.pri
rename {meta-boot2qt-distro/dynamic-layers/intel/recipes-qt => meta-boot2qt/recipes-qt/boot2qt-addons}/default-qt-envs/kms.conf (100%)
diff --git a/meta-boot2qt-distro/conf/distro/include/boundary.inc b/meta-boot2qt-distro/conf/distro/include/boundary.inc
index d3075a6c..76c570e4 100644
--- a/meta-boot2qt-distro/conf/distro/include/boundary.inc
+++ b/meta-boot2qt-distro/conf/distro/include/boundary.inc
@@ -32,6 +32,7 @@ include conf/distro/include/fsl.inc
BBMASK += " \
meta-boundary/recipes-core/init-ifupdown \
meta-boundary/recipes-boundary/images \
+ meta-boundary/recipes-graphics/wayland \
meta-boundary/recipes-graphics/xorg-xserver \
"
diff --git a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-qt/qt5/qtbase_git.bbappend b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-qt/qt5/qtbase_git.bbappend
new file mode 100644
index 00000000..3405f2f3
--- /dev/null
+++ b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-qt/qt5/qtbase_git.bbappend
@@ -0,0 +1,38 @@
+############################################################################
+##
+## Copyright (C) 2019 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+PACKAGECONFIG_append_mx8 = " gbm kms"
+
+QT_QPA_DEFAULT_PLATFORM ?= "eglfs"
+QT_QPA_DEFAULT_PLATFORM_mx6ull ?= "linuxfb"
+QT_QPA_DEFAULT_PLATFORM_mx7 ?= "linuxfb"
+
+QT_QPA_EGLFS_INTEGRATION_mx ?= "eglfs_viv"
+QT_QPA_EGLFS_INTEGRATION_mx6ull ?= ""
+QT_QPA_EGLFS_INTEGRATION_mx7 ?= ""
diff --git a/meta-boot2qt-distro/dynamic-layers/intel/recipes-qt/default-qt-envs.bbappend b/meta-boot2qt-distro/dynamic-layers/intel/recipes-qt/default-qt-envs.bbappend
index b709228f..b69d9219 100644
--- a/meta-boot2qt-distro/dynamic-layers/intel/recipes-qt/default-qt-envs.bbappend
+++ b/meta-boot2qt-distro/dynamic-layers/intel/recipes-qt/default-qt-envs.bbappend
@@ -27,8 +27,6 @@
##
############################################################################
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
SRC_URI += "file://kms.conf"
do_configure_append() {
diff --git a/meta-boot2qt-distro/dynamic-layers/intel/recipes-qt/qt5/qtbase_git.bbappend b/meta-boot2qt-distro/dynamic-layers/intel/recipes-qt/qt5/qtbase_git.bbappend
index 602782e2..7f1191b8 100644
--- a/meta-boot2qt-distro/dynamic-layers/intel/recipes-qt/qt5/qtbase_git.bbappend
+++ b/meta-boot2qt-distro/dynamic-layers/intel/recipes-qt/qt5/qtbase_git.bbappend
@@ -28,3 +28,5 @@
############################################################################
PACKAGECONFIG += "gbm kms"
+
+QT_QPA_EGLFS_INTEGRATION ?= "eglfs_kms"
diff --git a/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/qt5/qtbase_git.bbappend b/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/qt5/qtbase_git.bbappend
new file mode 100644
index 00000000..db6b219a
--- /dev/null
+++ b/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/qt5/qtbase_git.bbappend
@@ -0,0 +1,30 @@
+############################################################################
+##
+## Copyright (C) 2019 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+QT_QPA_EGLFS_INTEGRATION ?= "eglfs_brcm"
diff --git a/meta-boot2qt-distro/dynamic-layers/tegra/recipes-qt/qt5/qtbase_git.bbappend b/meta-boot2qt-distro/dynamic-layers/tegra/recipes-qt/qt5/qtbase_git.bbappend
index d48d6ac8..4de2e9ea 100644
--- a/meta-boot2qt-distro/dynamic-layers/tegra/recipes-qt/qt5/qtbase_git.bbappend
+++ b/meta-boot2qt-distro/dynamic-layers/tegra/recipes-qt/qt5/qtbase_git.bbappend
@@ -1,6 +1,6 @@
############################################################################
##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2019 The Qt Company Ltd.
## Contact: https://www.qt.io/licensing/
##
## This file is part of the Boot to Qt meta layer.
@@ -28,3 +28,5 @@
############################################################################
PACKAGECONFIG += "kms"
+
+QT_QPA_EGLFS_INTEGRATION ?= "eglfs_kms_egldevice"
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/intel-corei7-64/oe-device-extra.pri b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/intel-corei7-64/oe-device-extra.pri
deleted file mode 100644
index cdb62045..00000000
--- a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/intel-corei7-64/oe-device-extra.pri
+++ /dev/null
@@ -1,10 +0,0 @@
-NUC_CFLAGS = -m64
-QMAKE_LIBS_EGL += -lEGL
-QMAKE_LIBS_OPENGL_ES2 += -lGLESv2 -lEGL
-QMAKE_CFLAGS += $$NUC_CFLAGS
-QMAKE_CXXFLAGS += $$NUC_CFLAGS
-
-QMAKE_PLATFORM += boot2qt
-
-QT_QPA_DEFAULT_PLATFORM = eglfs
-EGLFS_DEVICE_INTEGRATION = eglfs_kms
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/jetson-tx1/oe-device-extra.pri b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/jetson-tx1/oe-device-extra.pri
deleted file mode 100644
index d4c14cae..00000000
--- a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/jetson-tx1/oe-device-extra.pri
+++ /dev/null
@@ -1,4 +0,0 @@
-QMAKE_PLATFORM += boot2qt
-
-QT_QPA_DEFAULT_PLATFORM = eglfs
-EGLFS_DEVICE_INTEGRATION = eglfs_kms_egldevice
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/jetson-tx2/oe-device-extra.pri b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/jetson-tx2/oe-device-extra.pri
deleted file mode 100644
index d4c14cae..00000000
--- a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/jetson-tx2/oe-device-extra.pri
+++ /dev/null
@@ -1,4 +0,0 @@
-QMAKE_PLATFORM += boot2qt
-
-QT_QPA_DEFAULT_PLATFORM = eglfs
-EGLFS_DEVICE_INTEGRATION = eglfs_kms_egldevice
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri
deleted file mode 100644
index f5445e38..00000000
--- a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri
+++ /dev/null
@@ -1,10 +0,0 @@
-IMX6_CFLAGS = -DLINUX=1 -DEGL_API_FB=1
-QMAKE_LIBS_EGL += -lEGL
-QMAKE_LIBS_OPENGL_ES2 += -lGLESv2 -lEGL -lGAL
-QMAKE_LIBS_OPENVG += -lOpenVG -lEGL -lGAL
-QMAKE_CFLAGS += $$IMX6_CFLAGS
-QMAKE_CXXFLAGS += $$IMX6_CFLAGS
-
-QMAKE_PLATFORM += boot2qt
-QT_QPA_DEFAULT_PLATFORM = eglfs
-EGLFS_DEVICE_INTEGRATION = eglfs_viv
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/mx6ull/oe-device-extra.pri b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/mx6ull/oe-device-extra.pri
deleted file mode 100644
index 9c4f92fc..00000000
--- a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/mx6ull/oe-device-extra.pri
+++ /dev/null
@@ -1,2 +0,0 @@
-QMAKE_PLATFORM += boot2qt
-QT_QPA_DEFAULT_PLATFORM = linuxfb
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/mx8/oe-device-extra.pri b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/mx8/oe-device-extra.pri
deleted file mode 100644
index 7e7cae34..00000000
--- a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/mx8/oe-device-extra.pri
+++ /dev/null
@@ -1,5 +0,0 @@
-QMAKE_CFLAGS_EGL += -DLINUX -DEGL_API_FB
-
-QMAKE_PLATFORM += boot2qt
-QT_QPA_DEFAULT_PLATFORM = eglfs
-EGLFS_DEVICE_INTEGRATION = eglfs_viv
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/nvidia-logan/oe-device-extra.pri b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/nvidia-logan/oe-device-extra.pri
deleted file mode 100644
index 6554742c..00000000
--- a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/nvidia-logan/oe-device-extra.pri
+++ /dev/null
@@ -1,11 +0,0 @@
-TK1_CFLAGS = -DWIN_INTERFACE_CUSTOM
-QMAKE_LIBS_EGL += -lEGL
-QMAKE_LIBS_OPENGL_ES2 += -lGLESv2 -lEGL
-QMAKE_CFLAGS += $$TK1_CFLAGS
-QMAKE_CXXFLAGS += $$TK1_CFLAGS
-
-QMAKE_PLATFORM += boot2qt
-
-QT_QPA_DEFAULT_PLATFORM = eglfs
-EGLFS_DEVICE_INTEGRATION = eglfs_kms_egldevice
-
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/oe-device-extra.pri b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/oe-device-extra.pri
deleted file mode 100644
index 250c999a..00000000
--- a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/oe-device-extra.pri
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file contains device-specific qmake.conf settings
-QMAKE_PLATFORM += boot2qt
-QT_QPA_DEFAULT_PLATFORM = eglfs
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri
deleted file mode 100644
index 9f648081..00000000
--- a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri
+++ /dev/null
@@ -1,11 +0,0 @@
-QMAKE_INCDIR_EGL = $$[QT_SYSROOT]/usr/include/interface/vcos/pthreads \
- $$[QT_SYSROOT]/usr/include/interface/vmcs_host/linux
-QMAKE_INCDIR_OPENGL_ES2 = $${QMAKE_INCDIR_EGL}
-
-QMAKE_LIBS_EGL = -lEGL -lGLESv2
-QMAKE_CFLAGS += $$RPI_CFLAGS
-QMAKE_CXXFLAGS += $$RPI_CFLAGS
-
-QMAKE_PLATFORM += boot2qt
-QT_QPA_DEFAULT_PLATFORM = eglfs
-EGLFS_DEVICE_INTEGRATION = eglfs_brcm
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/ti33x/oe-device-extra.pri b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/ti33x/oe-device-extra.pri
deleted file mode 100644
index 0a18a5df..00000000
--- a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/ti33x/oe-device-extra.pri
+++ /dev/null
@@ -1,6 +0,0 @@
-QMAKE_LIBS_EGL = -lEGL -lIMGegl -lsrv_um
-QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 $${QMAKE_LIBS_EGL}
-QMAKE_LIBS_OPENVG = -lOpenVG $${QMAKE_LIBS_EGL}
-
-QMAKE_PLATFORM += boot2qt
-QT_QPA_DEFAULT_PLATFORM = eglfs
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend
index 1525f3c5..cb346298 100644
--- a/meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend
@@ -46,17 +46,22 @@ PACKAGECONFIG += " \
xkbcommon \
"
-PACKAGECONFIG_append_mx8 = "gbm kms"
-
PACKAGECONFIG_remove = "tests"
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
SRC_URI += " \
- file://oe-device-extra.pri \
file://0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch \
file://0002-Disable-ltcg-for-windows-and-static-libs.patch \
"
+
+QT_QPA_DEFAULT_PLATFORM ??= "eglfs"
+QT_QPA_EGLFS_INTEGRATION ??= ""
+
do_configure_prepend() {
- install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs
+ echo "QMAKE_PLATFORM += boot2qt" >> ${S}/mkspecs/oe-device-extra.pri
+ echo "QT_QPA_DEFAULT_PLATFORM = ${QT_QPA_DEFAULT_PLATFORM}" >> ${S}/mkspecs/oe-device-extra.pri
+ if [ -n "${QT_QPA_EGLFS_INTEGRATION}" ]; then
+ echo "EGLFS_DEVICE_INTEGRATION = ${QT_QPA_EGLFS_INTEGRATION}" >> ${S}/mkspecs/oe-device-extra.pri
+ fi
}
diff --git a/meta-boot2qt-distro/dynamic-layers/intel/recipes-qt/default-qt-envs/kms.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs/kms.conf
similarity index 100%
rename from meta-boot2qt-distro/dynamic-layers/intel/recipes-qt/default-qt-envs/kms.conf
rename to meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs/kms.conf
--
GitLab