From 683bf7ca42ccee7fcde1fab5142b76183b130db2 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Fri, 23 Aug 2019 15:55:44 +0300
Subject: [PATCH] imx8: match linux-libc-headers version with the kernel
version
gstreamer plugins have kernel version specific code that was
failing since the headers did not match the kernel.
Change-Id: Ifea9e874f78b6ce7ffc87d644c66afe49eb3f762
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
---
.../conf/distro/include/apalis-imx8.conf | 4 +-
.../conf/distro/include/colibri-imx8qxp.conf | 4 +-
.../conf/distro/include/fsl-imx8.inc | 4 ++
.../conf/distro/include/toradex-imx8.inc | 37 +++++++++++++++++++
4 files changed, 43 insertions(+), 6 deletions(-)
create mode 100644 meta-boot2qt-distro/conf/distro/include/toradex-imx8.inc
diff --git a/meta-boot2qt-distro/conf/distro/include/apalis-imx8.conf b/meta-boot2qt-distro/conf/distro/include/apalis-imx8.conf
index 833af446..a4ab713e 100644
--- a/meta-boot2qt-distro/conf/distro/include/apalis-imx8.conf
+++ b/meta-boot2qt-distro/conf/distro/include/apalis-imx8.conf
@@ -27,9 +27,7 @@
##
############################################################################
-include conf/distro/include/fsl-imx8.inc
-
-FSL_EULA_FILE := "${COREBASE}/../meta-fsl-bsp-release-toradex/imx/EULA.txt"
+include conf/distro/include/toradex-imx8.inc
DEPLOY_CONF_NAME = "Toradex Apalis iMX8"
diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-imx8qxp.conf b/meta-boot2qt-distro/conf/distro/include/colibri-imx8qxp.conf
index 2b900c14..4ed5c077 100644
--- a/meta-boot2qt-distro/conf/distro/include/colibri-imx8qxp.conf
+++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx8qxp.conf
@@ -27,8 +27,6 @@
##
############################################################################
-include conf/distro/include/fsl-imx8.inc
-
-FSL_EULA_FILE := "${COREBASE}/../meta-fsl-bsp-release-toradex/imx/EULA.txt"
+include conf/distro/include/toradex-imx8.inc
DEPLOY_CONF_NAME = "Toradex Colibri iMX8QXP"
diff --git a/meta-boot2qt-distro/conf/distro/include/fsl-imx8.inc b/meta-boot2qt-distro/conf/distro/include/fsl-imx8.inc
index 05201cb6..22e71405 100644
--- a/meta-boot2qt-distro/conf/distro/include/fsl-imx8.inc
+++ b/meta-boot2qt-distro/conf/distro/include/fsl-imx8.inc
@@ -60,6 +60,10 @@ PREFERRED_VERSION_gstreamer1.0-plugins-bad = "1.14.imx"
PREFERRED_VERSION_gstreamer1.0-plugins-good = "1.14.imx"
PREFERRED_VERSION_gstreamer1.0 = "1.14.imx"
+# match linux-imx kernel versions
+PREFERRED_VERSION_linux-libc-headers_imx = "4.14.98"
+PV_pn-linux-libc-headers = "4.14.98"
+
KERNEL_MODULE_PACKAGE_SUFFIX ?= "-${@d.getVar('KERNEL_VERSION').replace('_','-')}"
WKS_FILE = "imx8-uboot-bootpart.wks.in"
diff --git a/meta-boot2qt-distro/conf/distro/include/toradex-imx8.inc b/meta-boot2qt-distro/conf/distro/include/toradex-imx8.inc
new file mode 100644
index 00000000..7ad1b5af
--- /dev/null
+++ b/meta-boot2qt-distro/conf/distro/include/toradex-imx8.inc
@@ -0,0 +1,37 @@
+############################################################################
+##
+## 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$
+##
+############################################################################
+
+include conf/distro/include/fsl-imx8.inc
+
+FSL_EULA_FILE := "${COREBASE}/../meta-fsl-bsp-release-toradex/imx/EULA.txt"
+
+# Keep the original version
+PREFERRED_VERSION_linux-libc-headers_imx = "4.14"
+PV_pn-linux-libc-headers = "4.14"
+
--
GitLab