From c9df259df4d915ca205ff69d18cdc1237a8b409c Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Wed, 4 Dec 2019 17:45:29 +0100 Subject: [PATCH] Fix "basehash value changed" errors and BB_NUMBER_THREADS usage Changing BB_NUMBER_THREADS between successive builds causes a "basehash value changed" error. Additionally, using BB_NUMBER_THREADS to pass a number of processes to run to xdc is wrong: PARALLEL_MAKE is the correct variable to use. Fix both problems by using oe.utils.parallel_make_argument() to obtain the number of processes to run from PARALLEL_MAKE. Fixes: ERROR: When reparsing .../meta-ti/recipes-ti/ipc/ti-ipc-rtos_git.bb.do_configure, the basehash value changed from 63897a188012cedde03f756b5dbbfa70 to 13b80bf4f4327c367bd201eb4aa32ad7. The metadata is not deterministic and this needs to be fixed. ERROR: When reparsing .../meta-ti/recipes-ti/ipc/ti-ipc-rtos_git.bb.do_compile, the basehash value changed from 2fb59a7db2a2f69d2c25c06c1b6a4245 to 314c664cc040afae2800fcc378dd9ae0. The metadata is not deterministic and this needs to be fixed. Steps to reproduce: BB_NUMBER_THREADS="3" bitbake ti-ipc-rtos ti-ipc-examples-linux BB_NUMBER_THREADS="4" bitbake -c cleansstate osal-rtos BB_NUMBER_THREADS="5" bitbake ti-ipc-rtos ti-ipc-examples-linux Reported here: https://e2e.ti.com/support/processors/f/791/p/825142/3059419 Reported-by: Matthew McKee (e-mail unknown) Suggested-by: Khem Raj Signed-off-by: Luca Ceresoli Signed-off-by: Denys Dmytriyenko --- classes/ti-pdk.bbclass | 2 +- recipes-ti/ipc/ti-ipc-rtos.inc | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/classes/ti-pdk.bbclass b/classes/ti-pdk.bbclass index 7030f70e..a07fdbb3 100644 --- a/classes/ti-pdk.bbclass +++ b/classes/ti-pdk.bbclass @@ -71,7 +71,7 @@ TI_PDK_DOXYGEN_SUPPORT ?= "1" TI_PDK_XDC_ARGS ?= "${TI_PDK_LIMIT_SOCS}" -PARALLEL_XDC = "--jobs=${BB_NUMBER_THREADS}" +PARALLEL_XDC = "${@oe.utils.parallel_make_argument(d, '--jobs=%d')}" PARALLEL_MAKE = "" def get_doxygen_support(d): diff --git a/recipes-ti/ipc/ti-ipc-rtos.inc b/recipes-ti/ipc/ti-ipc-rtos.inc index 7789b5a1..baf1ccc1 100644 --- a/recipes-ti/ipc/ti-ipc-rtos.inc +++ b/recipes-ti/ipc/ti-ipc-rtos.inc @@ -84,12 +84,13 @@ IPC_TARGETS_am65xx = "\ ti.targets.arm.elf.R5F="${M4_TOOLCHAIN_INSTALL_DIR}" \ " +PARALLEL_XDC = "${@oe.utils.parallel_make_argument(d, '--jobs=%d')}" EXTRA_OEMAKE = "\ PLATFORM=${PLATFORM} \ XDC_INSTALL_DIR="${XDC_INSTALL_DIR}" \ BIOS_INSTALL_DIR="${SYSBIOS_INSTALL_DIR}" \ ${IPC_TARGETS} \ - JOBS="--jobs=${BB_NUMBER_THREADS}" \ + ${PARALLEL_XDC} \ JAVA_TOOL_OPTIONS=-Xss2560k \ " EXTRA_OEMAKE_append_am65xx = " PDK_INSTALL_DIR=${PDK_INSTALL_DIR}"