From e9a5445a5ac0266cf274f4e1eba2f9fe951f6159 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Wed, 2 Nov 2022 17:55:54 +0100 Subject: uprev-srcrev: handle mainline rt kernel linux-toradex-mainline uses different git repos and git hashes for the non real time and real time kernel flavours. Only the hash for the selected DISTRO is currently handled which in our CI is the non real time case. Add to additionally uprev also the hash for the RT kernel. Related-to: ELB-4868 Signed-off-by: Max Krummenacher --- scripts/uprev-srcrev | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/scripts/uprev-srcrev b/scripts/uprev-srcrev index de0241e..c9ae34f 100755 --- a/scripts/uprev-srcrev +++ b/scripts/uprev-srcrev @@ -21,6 +21,12 @@ import scriptutils logger = scriptutils.logger_create('uprev-srcrev') # meta-toradex-bsp-common/recipes-bsp/u-boot/u-boot_%.bbappend needs to be done manually, bbappends are not supported + +# recipes which need additonally be updated with the RT distro set +recipes_tdxref_rt = [ + "../layers/meta-toradex-bsp-common/recipes-kernel/linux/linux-toradex-mainline_git.bb", + ] + recipes_tdxref = [ "../layers/meta-toradex-bsp-common/recipes-kernel/linux/linux-toradex-mainline_git.bb", "../layers/meta-toradex-bsp-common/recipes-kernel/linux/device-tree-overlays-mainline_git.bb", @@ -73,6 +79,15 @@ def uprev(args): res = uprev_recipe(args, env, recipe) if (res != os.EX_OK): return res + + # handle special rt case + env['DISTRO'] = "tdx-xwayland-rt" + for recipe in recipes_tdxref_rt: + logger.info('Processing recipe {}'.format(recipe)) + res = uprev_recipe(args, env, recipe) + if (res != os.EX_OK): + return res + return os.EX_OK def main(): -- cgit v1.2.3