From b6137c5d5efbfc3ddcb0a1074fc1d201f125ee85 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Tue, 1 Feb 2022 10:47:10 +0100 Subject: [PATCH] linux-dey: move the version specific info to the proper bitbake recipes The license checksum and the source branch should be on the properly versioned bitbake recipes. Otherwise, when we include this common file in a different version linux recipe (for example, the upcoming 5.10) it will inherit incorrect values. While on it, fix the incorrect license checksum values for the linux 5.4 recipes. Signed-off-by: Javier Viguera --- meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc | 2 -- meta-digi-arm/recipes-kernel/linux/linux-dey_5.4.bb | 3 ++- meta-digi-arm/recipes-kernel/linux/linux-imx-headers_5.4.bb | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc index bc8311738..7f314a1da 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc @@ -1,10 +1,8 @@ # Copyright (C) 2018-2021 Digi International LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" LOCALVERSION = "-dey" -SRCBRANCH = "v5.4.70/master" SRCREV = "${AUTOREV}" # Select internal or Github Linux repo diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.4.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.4.bb index d194a6314..f9a5b1f3a 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.4.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.4.bb @@ -2,13 +2,14 @@ SUMMARY = "Linux kernel for Digi boards" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "lzop-native bc-native" DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-native', '', d)}" inherit kernel fsl-kernel-localversion +SRCBRANCH = "v5.4.70/master" require recipes-kernel/linux/linux-dey-src.inc require ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'linux-virtualization.inc', '', d)} diff --git a/meta-digi-arm/recipes-kernel/linux/linux-imx-headers_5.4.bb b/meta-digi-arm/recipes-kernel/linux/linux-imx-headers_5.4.bb index 566136bd8..997a2f6e0 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-imx-headers_5.4.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-imx-headers_5.4.bb @@ -5,8 +5,9 @@ SUMMARY = "Installs i.MX-specific kernel headers" DESCRIPTION = "Installs i.MX-specific kernel headers to userspace. \ New headers are installed in ${includedir}/imx." LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" +SRCBRANCH = "v5.4.70/master" require recipes-kernel/linux/linux-dey-src.inc S = "${WORKDIR}/git"