From f894d46366bbc61c7da55dfb35a320f9da2bef20 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 21 Jun 2022 10:47:38 +0200
Subject: [kernel-vanilla] Prefer /boot/config-mltk as config base

---
 core/modules/kernel-vanilla/module.build | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'core/modules/kernel-vanilla')

diff --git a/core/modules/kernel-vanilla/module.build b/core/modules/kernel-vanilla/module.build
index f91108f8..7712b334 100644
--- a/core/modules/kernel-vanilla/module.build
+++ b/core/modules/kernel-vanilla/module.build
@@ -166,10 +166,13 @@ kernel_build_id() {
 # Get path of kernel config zu base this kernel on; empty if none exists
 kernel_config_base() {
 	local src
-	src="/boot/config-$(uname -r)"
-	if [ -s "$src" ]; then
-		echo "$src"
-	elif [ -f "/proc/config.gz" ]; then
+	for src in "/boot/config-mltk" "/boot/config-$(uname -r)"; do
+		if [ -s "$src" ]; then
+			echo "$src"
+			return 0
+		fi
+	done
+	if [ -f "/proc/config.gz" ]; then
 		zcat "/proc/config.gz" > "${ROOT_DIR}/tmp/kernel-config"
 		echo "${ROOT_DIR}/tmp/kernel-config"
 	fi
-- 
cgit v1.2.3-55-g7522