summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Bessler <manuel.bessler@gmail.com>2020-01-14 13:48:34 -0500
committerOtavio Salvador <otavio@ossystems.com.br>2020-04-29 23:13:41 -0300
commit6b9b83814d35d9055f0c2578f76a564096b8115f (patch)
tree065994a6ca5b3e20bbb273279f931a169f52c5ba
parentef01e8bffe63621871c696bcc3c5b68b40680033 (diff)
downloadmeta-freescale-6b9b83814d35d9055f0c2578f76a564096b8115f.tar.gz
imx-base: non-overriding append for WKS_FILE_DEPENDS
On mx8, `WKS_FILE_DEPENDS_mx8 += "imx-boot"` overrides the content of `WKS_FILE_DEPENDS` instead of appending, causing `do_image_wic` to complain about missing dependencies for `wic-tools`. (cherry picked from commit 7b49a35b976bc76ff9de66191ad09558639e000b)
-rw-r--r--conf/machine/include/imx-base.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index f498d6ae..9086fb9d 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -324,7 +324,7 @@ WKS_FILE_DEPENDS ?= " \
324 ${@bb.utils.contains('MACHINE_FEATURES', 'optee', '${OPTEE_WKS_FILE_DEPENDS}', '', d)} \ 324 ${@bb.utils.contains('MACHINE_FEATURES', 'optee', '${OPTEE_WKS_FILE_DEPENDS}', '', d)} \
325" 325"
326 326
327WKS_FILE_DEPENDS_mx8 += "imx-boot" 327WKS_FILE_DEPENDS_append_mx8 = " imx-boot "
328 328
329SOC_DEFAULT_WKS_FILE ?= "imx-uboot-bootpart.wks.in" 329SOC_DEFAULT_WKS_FILE ?= "imx-uboot-bootpart.wks.in"
330SOC_DEFAULT_WKS_FILE_mx8 ?= "imx-imx-boot-bootpart.wks.in" 330SOC_DEFAULT_WKS_FILE_mx8 ?= "imx-imx-boot-bootpart.wks.in"