From 6ced5cc02637fb6dbc980aa77fcdc77f2ccf5067 Mon Sep 17 00:00:00 2001 From: ColorfulRhino <131405023+ColorfulRhino@users.noreply.github.com> Date: Sat, 30 Mar 2024 20:34:57 +0100 Subject: [PATCH] meson-s4t7: Fix custom_kernel_config: hash modification has to happen inside the first function call Will be ignored on second time the function is called --- config/sources/families/meson-s4t7.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/sources/families/meson-s4t7.conf b/config/sources/families/meson-s4t7.conf index 29c87d71e2ab..ae18164b96d4 100644 --- a/config/sources/families/meson-s4t7.conf +++ b/config/sources/families/meson-s4t7.conf @@ -127,10 +127,12 @@ function custom_kernel_config__add_khadas_common_drivers() { # Hack to ensure that we will recreate kernel if common_drivers source changes kernel_config_modifying_hashes+=( "khadas_common_drivers=${GIT_INFO_COMMON_DRIVERS[SHA1]}" ) + + # viraniac: kernel_config_modifying_hashes is only needed during first call of this function to calculate kernel artifact version string. It serves no purpose whatsoever during second call. + kernel_config_modifying_hashes+=("CONFIG_DEBUG_KERNEL=y" "CONFIG_EXPERT=y" "CONFIG_EMBEDDED=y") else # Unfortunately, debug kernel has to be enabled to make khadas_common_drivers compile display_alert "Enabling kernel config" "DEBUG_KERNEL=y, EXPERT=y, EMBEDDED=y to fix khadas_common_drivers compilation" "info" - kernel_config_modifying_hashes+=("CONFIG_DEBUG_KERNEL=y" "CONFIG_EXPERT=y" "CONFIG_EMBEDDED=y") kernel_config_set_y DEBUG_KERNEL kernel_config_set_y EXPERT kernel_config_set_y EMBEDDED