From 2c59b72561134efd8e2adb3e7018d657662d48ad Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 24 Apr 2023 08:28:03 -0300 Subject: linux-fslc: remove linux-fslc.inc The .inc file is pointless as it is dead simple and splitting it just adds complexity, so we can remove it. Signed-off-by: Otavio Salvador --- recipes-kernel/linux/linux-fslc.inc | 10 ---------- recipes-kernel/linux/linux-fslc_6.1.bb | 9 +++++++-- recipes-kernel/linux/linux-imx.inc | 2 +- recipes-kernel/linux/linux-imx_6.1.bb | 3 --- 4 files changed, 8 insertions(+), 16 deletions(-) delete mode 100644 recipes-kernel/linux/linux-fslc.inc diff --git a/recipes-kernel/linux/linux-fslc.inc b/recipes-kernel/linux/linux-fslc.inc deleted file mode 100644 index f081dd7c..00000000 --- a/recipes-kernel/linux/linux-fslc.inc +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (C) 2012-2015 O.S. Systems Software LTDA. -# Released under the MIT license (see COPYING.MIT for the terms) - -require recipes-kernel/linux/linux-imx.inc - -DEPENDS += "bc-native" - -SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https \ - file://defconfig" -LOCALVERSION = "-fslc" diff --git a/recipes-kernel/linux/linux-fslc_6.1.bb b/recipes-kernel/linux/linux-fslc_6.1.bb index 9f2ae131..879c9e13 100644 --- a/recipes-kernel/linux/linux-fslc_6.1.bb +++ b/recipes-kernel/linux/linux-fslc_6.1.bb @@ -10,9 +10,12 @@ provide support for some backported features and fixes, or because it was applie and takes some time to become part of a stable version, or because it is not applicable for \ upstreaming." -include linux-fslc.inc +DEPENDS += "bc-native" -LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" +require linux-imx.inc + +SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https \ + file://defconfig" # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition # required by kernel-yocto.bbclass. @@ -24,4 +27,6 @@ LINUX_VERSION = "6.1.24" KBRANCH = "6.1.x+fslc" SRCREV = "4c5917cbbb13c618abe50bb85048b784bd1b1095" +LOCALVERSION = "-fslc" + COMPATIBLE_MACHINE = "(imx-generic-bsp)" diff --git a/recipes-kernel/linux/linux-imx.inc b/recipes-kernel/linux/linux-imx.inc index 1a37bf20..0150a3f8 100644 --- a/recipes-kernel/linux/linux-imx.inc +++ b/recipes-kernel/linux/linux-imx.inc @@ -2,7 +2,7 @@ # Released under the MIT license (see COPYING.MIT for the terms) LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" inherit kernel-yocto kernel fsl-kernel-localversion fsl-vivante-kernel-driver-handler diff --git a/recipes-kernel/linux/linux-imx_6.1.bb b/recipes-kernel/linux/linux-imx_6.1.bb index ca298c4c..f979c146 100644 --- a/recipes-kernel/linux/linux-imx_6.1.bb +++ b/recipes-kernel/linux/linux-imx_6.1.bb @@ -12,9 +12,6 @@ i.MX Family Reference Boards. It includes support for many IPs such as GPU, VPU require recipes-kernel/linux/linux-imx.inc -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" - DEPENDS += "lzop-native bc-native" # UPGRADE NOTE: -- cgit v1.2.3-54-g00ecf