From 9b70101d07b48ad340605d63f352f02a720646fd Mon Sep 17 00:00:00 2001
From: Ricardo Pardini <ricardo@pardini.net>
Date: Wed, 19 Jul 2023 23:31:19 +0200
Subject: [PATCH] artifact: kernel: force `D0000` drivers hash for
 artifact_version if `EXTRAWIFI=no`

---
 lib/functions/artifacts/artifact-kernel.sh | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/lib/functions/artifacts/artifact-kernel.sh b/lib/functions/artifacts/artifact-kernel.sh
index 70d1b2f394..fbe9b91455 100644
--- a/lib/functions/artifacts/artifact-kernel.sh
+++ b/lib/functions/artifacts/artifact-kernel.sh
@@ -16,6 +16,7 @@ function artifact_kernel_config_dump() {
 	artifact_input_variables[KERNELBRANCH]="${KERNELBRANCH}"
 	artifact_input_variables[KERNELPATCHDIR]="${KERNELPATCHDIR}"
 	artifact_input_variables[ARCH]="${ARCH}"
+	artifact_input_variables[EXTRAWIFI]="${EXTRAWIFI:-"yes"}"
 }
 
 # This is run in a logging section.
@@ -87,9 +88,14 @@ function artifact_kernel_prepare_version() {
 
 	declare short_sha1="${GIT_INFO_KERNEL[SHA1]:0:${short_hash_size}}"
 
-	# get the drivers hash...
-	declare kernel_drivers_patch_hash
-	do_with_hooks kernel_drivers_create_patches_hash_only
+	# get the drivers hash... or "0000000000000000" if EXTRAWIFI=no
+	if [[ "${EXTRAWIFI:-"yes"}" == "no" ]]; then
+		display_alert "Skipping drivers patch hash for kernel" "due to EXTRAWIFI=no" "info"
+		declare kernel_drivers_patch_hash="0000000000000000"
+	else
+		declare kernel_drivers_patch_hash
+		do_with_hooks kernel_drivers_create_patches_hash_only
+	fi
 	declare kernel_drivers_hash_short="${kernel_drivers_patch_hash:0:${short_hash_size}}"
 
 	# get the kernel patches hash...
@@ -98,8 +104,8 @@ function artifact_kernel_prepare_version() {
 	declare hash_files="undetermined"
 	display_alert "User patches directory for kernel" "${USERPATCHES_PATH}/kernel/${KERNELPATCHDIR}" "info"
 	declare -a kernel_patch_dirs=()
-	for patch_dir in ${KERNELPATCHDIR} ; do
-		kernel_patch_dirs+=( "${SRC}/patch/kernel/${patch_dir}" "${USERPATCHES_PATH}/kernel/${patch_dir}" )
+	for patch_dir in ${KERNELPATCHDIR}; do
+		kernel_patch_dirs+=("${SRC}/patch/kernel/${patch_dir}" "${USERPATCHES_PATH}/kernel/${patch_dir}")
 	done
 	calculate_hash_for_all_files_in_dirs "${kernel_patch_dirs[@]}"
 	patches_hash="${hash_files}"