image_types_wic: Simplify search path

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>

diff --git a/meta/classes-recipe/image_types_wic.bbclass b/meta/classes-recipe/image_types_wic.bbclass
index cd1131a7cccc3271010e7521f4cc0c405f2221f6..aa0680561b9ae93ac4f94ca32bb7dce9945e7b50 100644 (file)
--- 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):