From cea7ab0501b6ce914144f3cdd4d6b049edb6ec41 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 10 Aug 2022 18:04:52 +0200 Subject: [PATCH] linux-dey: move SRCREV to actual versioned recipes The SRCREV may change depending on the version of the kernel, so it cannot be a common variable for all kernel versions. Signed-off-by: Javier Viguera --- meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc | 1 - meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb | 1 + meta-digi-arm/recipes-kernel/linux/linux-dey_5.4.bb | 2 ++ 3 files changed, 3 insertions(+), 1 deletion(-) 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 877f3613c..e3e15bca2 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc @@ -1,7 +1,6 @@ # Copyright (C) 2018-2022 Digi International LOCALVERSION = "-dey" -SRCREV = "${AUTOREV}" # Select internal or Github Linux repo LINUX_URI_STASH = "${DIGI_MTK_GIT}/linux/linux.git;protocol=ssh" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb index ba8fd37d3..5f7283502 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb @@ -12,6 +12,7 @@ inherit ${@oe.utils.conditional('DEY_BUILD_PLATFORM', 'NXP', 'fsl-kernel-localve SRCBRANCH = "v5.15.32/nxp/master" SRCBRANCH:stm32mpcommon = "v5.15.24/stm/master" +SRCREV = "${AUTOREV}" require ${@oe.utils.conditional('DEY_BUILD_PLATFORM', 'STM', 'recipes-kernel/linux/linux-stm32mp.inc', '', d)} # Don't create custom folder for kernel artifacts 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 2bc0e2ec5..30ce74e02 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 @@ -10,6 +10,8 @@ inherit kernel inherit ${@oe.utils.conditional('DEY_BUILD_PLATFORM', 'NXP', 'fsl-kernel-localversion', '', d)} SRCBRANCH = "v5.4.70/master" +SRCREV = "${AUTOREV}" + require recipes-kernel/linux/linux-dey-src.inc require ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'linux-virtualization.inc', '', d)} require recipes-kernel/linux/linux-trustfence.inc