From cb567c262c8c0cd7a18d4e5a821d26e84f268e8a Mon Sep 17 00:00:00 2001 From: Andrey Zhizhikin Date: Sun, 5 Jun 2022 19:38:23 +0000 Subject: linux-fslc-lts: upgrade to 5.15.x+fslc Kernel 5.15.y is used by all BSP flavors, and in order to align with this strategy, LTS kernel recipe need to be upgraded from 5.10.y to 5.15.y as well. Pick up the 5.15.x+fslc kernel branch from linux-fslc repository. Kernel repository has been upgraded up to v5.15.44 from stable korg. Signed-off-by: Andrey Zhizhikin --- .../linux/linux-fslc-lts-mfgtool_5.10.bb | 15 ------------ .../linux/linux-fslc-lts-mfgtool_5.15.bb | 15 ++++++++++++ recipes-kernel/linux/linux-fslc-lts_5.10.bb | 27 ---------------------- recipes-kernel/linux/linux-fslc-lts_5.15.bb | 27 ++++++++++++++++++++++ 4 files changed, 42 insertions(+), 42 deletions(-) delete mode 100644 recipes-kernel/linux/linux-fslc-lts-mfgtool_5.10.bb create mode 100644 recipes-kernel/linux/linux-fslc-lts-mfgtool_5.15.bb delete mode 100644 recipes-kernel/linux/linux-fslc-lts_5.10.bb create mode 100644 recipes-kernel/linux/linux-fslc-lts_5.15.bb (limited to 'recipes-kernel') diff --git a/recipes-kernel/linux/linux-fslc-lts-mfgtool_5.10.bb b/recipes-kernel/linux/linux-fslc-lts-mfgtool_5.10.bb deleted file mode 100644 index 95dd72fb8..000000000 --- a/recipes-kernel/linux/linux-fslc-lts-mfgtool_5.10.bb +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (C) 2014-2018 O.S. Systems Software LTDA. -# Copyright (C) 2014-2016 Freescale Semiconductor - -SUMMARY = "Produces a Manufacturing Tool compatible Linux Kernel" -DESCRIPTION = "Linux Kernel provided and supported by the Freescale Community \ -that produces a Manufacturing Tool compatible Linux Kernel to be used in updater \ -environment" - -FILESEXTRAPATHS:prepend := "${THISDIR}/linux-fslc:" -require linux-fslc-lts_${PV}.bb -require linux-mfgtool.inc - -KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME" -MODULE_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME" -do_package[vardepsexclude] = "DATETIME" diff --git a/recipes-kernel/linux/linux-fslc-lts-mfgtool_5.15.bb b/recipes-kernel/linux/linux-fslc-lts-mfgtool_5.15.bb new file mode 100644 index 000000000..95dd72fb8 --- /dev/null +++ b/recipes-kernel/linux/linux-fslc-lts-mfgtool_5.15.bb @@ -0,0 +1,15 @@ +# Copyright (C) 2014-2018 O.S. Systems Software LTDA. +# Copyright (C) 2014-2016 Freescale Semiconductor + +SUMMARY = "Produces a Manufacturing Tool compatible Linux Kernel" +DESCRIPTION = "Linux Kernel provided and supported by the Freescale Community \ +that produces a Manufacturing Tool compatible Linux Kernel to be used in updater \ +environment" + +FILESEXTRAPATHS:prepend := "${THISDIR}/linux-fslc:" +require linux-fslc-lts_${PV}.bb +require linux-mfgtool.inc + +KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME" +MODULE_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME" +do_package[vardepsexclude] = "DATETIME" diff --git a/recipes-kernel/linux/linux-fslc-lts_5.10.bb b/recipes-kernel/linux/linux-fslc-lts_5.10.bb deleted file mode 100644 index 3e0d0847d..000000000 --- a/recipes-kernel/linux/linux-fslc-lts_5.10.bb +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright (C) 2012-2019 O.S. Systems Software LTDA. -# Released under the MIT license (see COPYING.MIT for the terms) -# -# SPDX-License-Identifier: MIT -# - -SUMMARY = "FSL Community BSP Linux mainline based kernel with backported features and fixes" -DESCRIPTION = "Linux kernel based on mainline kernel used by FSL Community BSP in order to \ -provide support for some backported features and fixes, or because it was applied in linux-next \ -and takes some time to become part of a stable version, or because it is not applicable for \ -upstreaming." - -include linux-fslc.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" - -# 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.10.109" - -KBRANCH = "5.10.x+fslc" -SRCREV = "ad946caa1bfa863f02a56d0741ad3c3dcc772ef8" - -COMPATIBLE_MACHINE = "(imx-generic-bsp)" diff --git a/recipes-kernel/linux/linux-fslc-lts_5.15.bb b/recipes-kernel/linux/linux-fslc-lts_5.15.bb new file mode 100644 index 000000000..dee0fdbf0 --- /dev/null +++ b/recipes-kernel/linux/linux-fslc-lts_5.15.bb @@ -0,0 +1,27 @@ +# Copyright (C) 2012-2019 O.S. Systems Software LTDA. +# Released under the MIT license (see COPYING.MIT for the terms) +# +# SPDX-License-Identifier: MIT +# + +SUMMARY = "FSL Community BSP Linux mainline based kernel with backported features and fixes" +DESCRIPTION = "Linux kernel based on mainline kernel used by FSL Community BSP in order to \ +provide support for some backported features and fixes, or because it was applied in linux-next \ +and takes some time to become part of a stable version, or because it is not applicable for \ +upstreaming." + +include linux-fslc.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" + +# 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.15.44" + +KBRANCH = "5.15.x+fslc" +SRCREV = "67660eca753c2a53730429fdeecb5de9ad3d13f8" + +COMPATIBLE_MACHINE = "(imx-generic-bsp)" -- cgit v1.2.3-54-g00ecf