From 411e0ed181ba93c5523cfb55130b2eedc3af9531 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 11 Jul 2022 15:44:34 +0200
Subject: [kernel-vanilla] Fix sof-firmware install on resumed build

---
 core/modules/kernel-vanilla/module.build | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/core/modules/kernel-vanilla/module.build b/core/modules/kernel-vanilla/module.build
index 7712b334..eb43e586 100644
--- a/core/modules/kernel-vanilla/module.build
+++ b/core/modules/kernel-vanilla/module.build
@@ -132,7 +132,8 @@ build() {
 
 	# copy most recent firmware
 	cde "${MODULE_WORK_DIR}"
-	mkdir -p "${MODULE_BUILD_DIR}/lib/firmware/intel"
+	mkdir -p "${MODULE_BUILD_DIR}/lib/firmware/intel" "${MODULE_BUILD_DIR}/usr/bin"
+	rm -rf -- "${MODULE_BUILD_DIR}/lib/firmware/intel/sof" "${MODULE_BUILD_DIR}/lib/firmware/intel/sof-tplg"
 	cp -r ./fw/* "${MODULE_BUILD_DIR}/lib/firmware/" || perror "Could not copy linux-firmware to '${MODULE_BUILD_DIR}/lib/firmware/'"
 	cde sof
 	FW_DEST="${MODULE_BUILD_DIR}/lib/firmware/intel" \
-- 
cgit v1.2.3-55-g7522