From c6fa9600119c30ab0b69857a0859a3339fdb5ede Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Tue, 17 Nov 2020 16:51:51 +0100 Subject: uprev-srcrev: uprev different lists depending on the project Use two lists of recipes which should be upreved, one for tdxref and one for Torizon builds. Currently Torizon has additionally the linux kmeta repo but lacks the Apalis TK1 U-Boot. Relates-to: AUT-507 Signed-off-by: Max Krummenacher --- scripts/uprev-srcrev | 41 ++++++++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/scripts/uprev-srcrev b/scripts/uprev-srcrev index 4e9511e..61afab5 100755 --- a/scripts/uprev-srcrev +++ b/scripts/uprev-srcrev @@ -20,17 +20,29 @@ import scriptutils logger = scriptutils.logger_create('uprev-srcrev') -recipes = [ - "../layers/meta-toradex-bsp-common/recipes-kernel/backports/backports_5.4.bb", - "../layers/meta-toradex-bsp-common/recipes-kernel/linux/linux-toradex-mainline_5.4.bb", - "../layers/meta-toradex-bsp-common/recipes-kernel/linux/device-tree-overlays-mainline_git.bb", - "../layers/meta-toradex-nxp/recipes-kernel/linux/linux-toradex_5.4-2.1.x.bb", - "../layers/meta-toradex-nxp/recipes-kernel/linux/device-tree-overlays_git.bb", - "../layers/meta-toradex-nxp/recipes-bsp/imx-sc-firmware/imx-sc-firmware-toradex_1.5.1.bb", - "../layers/meta-toradex-nxp/recipes-bsp/u-boot/u-boot-toradex_2020.04.bb", - "../layers/meta-toradex-nxp/recipes-bsp/u-boot/u-boot-toradex_2020.07.bb", - "../layers/meta-toradex-tegra/recipes-bsp/u-boot/u-boot-toradex-tk1_2019.07.bb", - ] +recipes_tdxref = [ + "../layers/meta-toradex-bsp-common/recipes-kernel/backports/backports_5.4.bb", + "../layers/meta-toradex-bsp-common/recipes-kernel/linux/linux-toradex-mainline_5.4.bb", + "../layers/meta-toradex-bsp-common/recipes-kernel/linux/device-tree-overlays-mainline_git.bb", + "../layers/meta-toradex-nxp/recipes-kernel/linux/linux-toradex_5.4-2.1.x.bb", + "../layers/meta-toradex-nxp/recipes-kernel/linux/device-tree-overlays_git.bb", + "../layers/meta-toradex-nxp/recipes-bsp/imx-sc-firmware/imx-sc-firmware-toradex_1.5.1.bb", + "../layers/meta-toradex-nxp/recipes-bsp/u-boot/u-boot-toradex_2020.04.bb", + "../layers/meta-toradex-nxp/recipes-bsp/u-boot/u-boot-toradex_2020.07.bb", + "../layers/meta-toradex-tegra/recipes-bsp/u-boot/u-boot-toradex-tk1_2019.07.bb", + ] + +recipes_torizon = [ + "../layers/meta-toradex-bsp-common/recipes-kernel/backports/backports_5.4.bb", + "../layers/meta-toradex-bsp-common/recipes-kernel/linux/linux-toradex-mainline_5.4.bb", + "../layers/meta-toradex-bsp-common/recipes-kernel/linux/device-tree-overlays-mainline_git.bb", + "../layers/meta-toradex-nxp/recipes-kernel/linux/linux-toradex_5.4-2.1.x.bb", + "../layers/meta-toradex-nxp/recipes-kernel/linux/device-tree-overlays_git.bb", + "../layers/meta-toradex-nxp/recipes-bsp/imx-sc-firmware/imx-sc-firmware-toradex_1.5.1.bb", + "../layers/meta-toradex-nxp/recipes-bsp/u-boot/u-boot-toradex_2020.04.bb", + "../layers/meta-toradex-nxp/recipes-bsp/u-boot/u-boot-toradex_2020.07.bb", + "../layers/meta-toradex-torizon/recipes-kernel/linux/linux-toradex-kmeta.inc", + ] def uprev_recipe(args, env, recipe): @@ -52,6 +64,13 @@ def uprev(args): # make sure that we query the remote repo as we execute the script, not # the clone we have in the local download. env['BB_SRCREV_POLICY'] = "clear" + + # decide if we build torizon or tdxref. Use the existence of meta-toradex-torizon + if os.path.exists(os.path.join(script_path, '../../meta-toradex-torizon')): + recipes = recipes_torizon + else: + recipes = recipes_tdxref + for recipe in recipes: logger.info('Processing recipe {}'.format(recipe)) uprev_recipe(args, env, recipe) -- cgit v1.2.3