diff mbox series

[4/4] image_types_wic: Simplify search path

Message ID 20260405144311.3734472-4-richard.purdie@linuxfoundation.org
State Accepted, archived
Commit 5dcd5df55a250fc758e79ad8e7e6b05d54df70b7
Headers show
Series [1/4] image_types_wic: Add files/wic to the search path for wks files | expand

Commit Message

Richard Purdie April 5, 2026, 2:43 p.m. UTC 
Standardise on one location by default for wic/wks files and simplify the
search path accordingly.

wic is now using BBPATH instead of BBLAYERS so this needs to be added to
WICVARS too.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/classes-recipe/image_types_wic.bbclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/meta/classes-recipe/image_types_wic.bbclass b/meta/classes-recipe/image_types_wic.bbclass
index cd1131a7ccc..aa0680561b9 100644
--- a/meta/classes-recipe/image_types_wic.bbclass
+++ b/meta/classes-recipe/image_types_wic.bbclass
@@ -10,6 +10,7 @@  WICVARS ?= "\
 	APPEND \
 	ASSUME_PROVIDED \
 	BBLAYERS \
+	BBPATH \
 	DEPLOY_DIR_IMAGE \
 	FAKEROOTCMD \
 	HOSTTOOLS_DIR \
@@ -45,7 +46,7 @@  inherit_defer ${@bb.utils.contains('INITRAMFS_IMAGE_BUNDLE', '1', 'kernel-artifa
 
 WKS_FILE ??= "${IMAGE_BASENAME}.${MACHINE}.wks"
 WKS_FILES ?= "${WKS_FILE} ${IMAGE_BASENAME}.wks"
-WKS_SEARCH_PATH ?= "${THISDIR}:${@':'.join('%s/files/wic' % p for p in '${BBPATH}'.split(':'))}:${@':'.join('%s/wic' % p for p in '${BBPATH}'.split(':'))}:${@':'.join('%s/scripts/lib/wic/canned-wks' % l for l in '${BBPATH}:${COREBASE}'.split(':'))}"
+WKS_SEARCH_PATH ?= "${THISDIR}:${@':'.join('%s/files/wic' % p for p in '${BBPATH}'.split(':'))}"
 WKS_FULL_PATH = "${@wks_search(d.getVar('WKS_FILES').split(), d.getVar('WKS_SEARCH_PATH')) or ''}"
 
 def wks_search(files, search_path):