linux-imx-[mfgtool]-5.4.3: update recipes to align with kernel-yocto

When kernel-yocto class is inherited by kernel recipes, the way how PV
is constructed changes to reflect GIT kernel tags and meta information.

This causes the fetcher search to fail, since paths used to locate files
are compiled from PV.

Replace version-specific paths in recipes to use PN instead, which is
registered in the fetcher as a valid search location.

Linux kernel recipe should have LINUX_VERSION also defined, since it is
used by kernel-yocto class to derive PV. This version is set to the real
kernel version provided by NXP in their source tree.

Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>

diff --git a/recipes-kernel/linux/linux-imx-mfgtool_5.4.3.bb b/recipes-kernel/linux/linux-imx-mfgtool_5.4.3.bb
index 543fe9800981a1f254393f55939fc18cc84544af..0a9f5259ed946927ab18c2c2a8740586eeb49aab 100644 (file)
--- a/recipes-kernel/linux/linux-imx-mfgtool_5.4.3.bb
+++ b/recipes-kernel/linux/linux-imx-mfgtool_5.4.3.bb
@@ -5,7 +5,7 @@ SUMMARY = "Produces a Manufacturing Tool compatible Linux Kernel"
 DESCRIPTION = "Linux Kernel provided and supported by Freescale that produces a \
 Manufacturing Tool compatible Linux Kernel to be used in updater environment"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux-imx-${PV}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/linux-imx:"
 require linux-imx_${PV}.bb
 require linux-mfgtool.inc
 

diff --git a/recipes-kernel/linux/linux-imx-5.4.3/0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch b/recipes-kernel/linux/linux-imx/0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch
similarity index 100%
rename from recipes-kernel/linux/linux-imx-5.4.3/0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch
rename to recipes-kernel/linux/linux-imx/0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch

diff --git a/recipes-kernel/linux/linux-imx-5.4.3/imx/defconfig b/recipes-kernel/linux/linux-imx/imx/defconfig
similarity index 100%
rename from recipes-kernel/linux/linux-imx-5.4.3/imx/defconfig
rename to recipes-kernel/linux/linux-imx/imx/defconfig

diff --git a/recipes-kernel/linux/linux-imx-5.4.3/mx8/defconfig b/recipes-kernel/linux/linux-imx/mx8/defconfig
similarity index 100%
rename from recipes-kernel/linux/linux-imx-5.4.3/mx8/defconfig
rename to recipes-kernel/linux/linux-imx/mx8/defconfig

diff --git a/recipes-kernel/linux/linux-imx_5.4.3.bb b/recipes-kernel/linux/linux-imx_5.4.3.bb
index 3d4fa86496b5d89248569867e3f975561f9eaf9e..6c042184ca4f69baa2e30fd888687cd17cd46252 100644 (file)
--- a/recipes-kernel/linux/linux-imx_5.4.3.bb
+++ b/recipes-kernel/linux/linux-imx_5.4.3.bb
@@ -2,6 +2,9 @@
 # Copyright 2017-2019 (C) NXP
 # Copyright 2018 (C) O.S. Systems Software LTDA.
 # Released under the MIT license (see COPYING.MIT for the terms)
+#
+# SPDX-License-Identifier: MIT
+#
 
 SUMMARY = "Linux Kernel provided and supported by NXP"
 DESCRIPTION = "Linux Kernel provided and supported by NXP with focus on \
@@ -18,6 +21,13 @@ SRCBRANCH = "lf-5.4.y"
 LOCALVERSION = "-1.0.0"
 SRCREV = "f8118585ee3c7025265b28985fdfe0af96a84466"
 
+# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition
+# required by kernel-yocto.bbclass.
+#
+# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
+# should be updated once patchlevel is merged.
+LINUX_VERSION = "5.4.3"
+
 SRC_URI += "file://0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch"
 
 DEFAULT_PREFERENCE = "1"