From 3262f6fcab4044f5497efdb89df89cbabbc704cc Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Sun, 2 Jul 2023 17:31:11 +0200 Subject: [PATCH] drivers-harness: add branch to drivers base cache key `declare cache_key_base="${KERNEL_MAJOR_MINOR}_${LINUXFAMILY}_${BRANCH}"` - this allows for 2 branches with the same version to not interfere with each other --- lib/functions/compilation/patch/drivers-harness.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/functions/compilation/patch/drivers-harness.sh b/lib/functions/compilation/patch/drivers-harness.sh index 54387fa5c4..e8cf5a8c32 100644 --- a/lib/functions/compilation/patch/drivers-harness.sh +++ b/lib/functions/compilation/patch/drivers-harness.sh @@ -22,7 +22,7 @@ function kernel_drivers_create_patches() { do_normalize_src_path="no" calculate_hash_for_variables "${KERNEL_DRIVERS_SKIP[*]}" declare hash_variables_short="${hash_variables:0:8}" - declare cache_key_base="${KERNEL_MAJOR_MINOR}_${LINUXFAMILY}" + declare cache_key_base="${KERNEL_MAJOR_MINOR}_${LINUXFAMILY}_${BRANCH}" declare cache_key="${cache_key_base}_${hash_files}-${hash_variables_short}" display_alert "Cache key base:" "$cache_key_base" "debug" display_alert "Cache key:" "$cache_key" "debug"