summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2021-12-14 09:50:27 +0100
committerMax Krummenacher <max.krummenacher@toradex.com>2022-01-06 16:36:49 +0100
commitb46b07908ec969fd2152311b36f1235c96611e22 (patch)
tree01b1662e1bff588e4735457f45596993117d0170 /scripts
parent1655653a6b02569d1d3a790effd1461b12e84dc3 (diff)
uprev-srcrev: fix uprev of tezi build
Uprev all recipes used by the Toradex Easy Installer. Do this by refactoring the list of recipes in a bsp list used for all builds and add the additional ones for TEZI and Torizon. Related-to: AUT-932 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit e835edf3bc368fc6beb64acefa96a349ec6da281) Conflicts: scripts/uprev-srcrev Fix wrong new override syntax conversion
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/uprev-srcrev17
1 files changed, 4 insertions, 13 deletions
diff --git a/scripts/uprev-srcrev b/scripts/uprev-srcrev
index ec17195..9751aa2 100755
--- a/scripts/uprev-srcrev
+++ b/scripts/uprev-srcrev
@@ -20,7 +20,7 @@ import scriptutils
logger = scriptutils.logger_create('uprev-srcrev')
-recipes:tdxref = [
+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",
@@ -38,14 +38,6 @@ recipes_tezi = [
]
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.3.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.7.0.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",
]
@@ -72,12 +64,11 @@ def uprev(args):
env['BB_SRCREV_POLICY'] = "clear"
# decide if we build torizon or tdxref. Use the existence of meta-toradex-torizon
+ recipes = recipes_tdxref
if os.path.exists(os.path.join(script_path, '../../meta-toradex-torizon')):
- recipes = recipes_torizon
+ recipes = recipes + recipes_torizon
elif os.path.exists(os.path.join(script_path, '../../meta-toradex-tezi')):
- recipes = recipes_tezi
- else:
- recipes = recipes:tdxref
+ recipes = recipes + recipes_tezi
for recipe in recipes:
logger.info('Processing recipe {}'.format(recipe))