[meta-freescale] [3rdparty][PATCH] machine/various: update wic dependency notation

[Eric Nelson]

As noted in [1], the notation for wic dependencies has changed.
Update machines other than wandboard with the new notation.

[1]: https://lists.yoctoproject.org/pipermail/meta-freescale/2017-June/020668.html
Signed-off-by: Eric Nelson <eric at nelint.com>

Signed-off-by: Eric Nelson <eric at nelint.com>
---
 conf/machine/cubox-i.conf          | 2 +-
 conf/machine/imx6dl-riotboard.conf | 2 +-
 conf/machine/nitrogen6sx.conf      | 2 +-
 conf/machine/nitrogen6x-lite.conf  | 2 +-
 conf/machine/nitrogen6x.conf       | 2 +-
 conf/machine/nitrogen7.conf        | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/conf/machine/cubox-i.conf b/conf/machine/cubox-i.conf
index af45c38..158f681 100644
--- a/conf/machine/cubox-i.conf
+++ b/conf/machine/cubox-i.conf
@@ -43,6 +43,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \
 
 WKS_FILES ?= "imx-uboot-spl.wks"
 
-IMAGE_DEPENDS_wic_append = " virtual/bootloader"
+do_image_wic[depends] += "virtual/bootloader:do_deploy mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
 
 IMAGE_FSTYPES = "wic.gz"
diff --git a/conf/machine/imx6dl-riotboard.conf b/conf/machine/imx6dl-riotboard.conf
index 6cc4f8c..6423067 100644
--- a/conf/machine/imx6dl-riotboard.conf
+++ b/conf/machine/imx6dl-riotboard.conf
@@ -24,6 +24,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \
 
 WKS_FILES ?= "imx-uboot.wks"
 
-IMAGE_DEPENDS_wic_append = " virtual/bootloader"
+do_image_wic[depends] += "virtual/bootloader:do_deploy"
 
 IMAGE_FSTYPES = "wic.gz"
diff --git a/conf/machine/nitrogen6sx.conf b/conf/machine/nitrogen6sx.conf
index 45b79f4..fa2ef6d 100644
--- a/conf/machine/nitrogen6sx.conf
+++ b/conf/machine/nitrogen6sx.conf
@@ -29,7 +29,7 @@ IMAGE_BOOT_FILES = " \
     ${KERNEL_IMAGETYPE} \
     ${KERNEL_IMAGETYPE}-imx6sx-nitrogen6sx.dtb;imx6sx-nitrogen6sx.dtb \
 "
-IMAGE_DEPENDS_wic_append = " dosfstools-native mtools-native"
+do_image_wic[depends] += "virtual/bootloader:do_deploy mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
 
 # Boot scripts to install
 BOOT_SCRIPTS = "6x_bootscript-${MACHINE}:6x_bootscript"
diff --git a/conf/machine/nitrogen6x-lite.conf b/conf/machine/nitrogen6x-lite.conf
index 11efddf..0961ddd 100644
--- a/conf/machine/nitrogen6x-lite.conf
+++ b/conf/machine/nitrogen6x-lite.conf
@@ -29,7 +29,7 @@ IMAGE_BOOT_FILES = " \
     ${KERNEL_IMAGETYPE} \
     ${KERNEL_IMAGETYPE}-imx6dl-nit6xlite.dtb;imx6dl-nit6xlite.dtb \
 "
-IMAGE_DEPENDS_wic_append = " dosfstools-native mtools-native"
+do_image_wic[depends] += "virtual/bootloader:do_deploy mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
 
 # Boot scripts to install
 BOOT_SCRIPTS = "6x_bootscript-${MACHINE}:6x_bootscript"
diff --git a/conf/machine/nitrogen6x.conf b/conf/machine/nitrogen6x.conf
index c4fe176..e1beffc 100644
--- a/conf/machine/nitrogen6x.conf
+++ b/conf/machine/nitrogen6x.conf
@@ -69,7 +69,7 @@ IMAGE_BOOT_FILES = " \
     ${KERNEL_IMAGETYPE}-imx6q-nitrogen6x.dtb;imx6q-nitrogen6x.dtb ${KERNEL_IMAGETYPE}-imx6dl-nitrogen6x.dtb;imx6dl-nitrogen6x.dtb \
     ${KERNEL_IMAGETYPE}-imx6q-nitrogen6_som2.dtb;imx6q-nitrogen6_som2.dtb ${KERNEL_IMAGETYPE}-imx6qp-nitrogen6_som2.dtb;imx6qp-nitrogen6_som2.dtb \
 "
-IMAGE_DEPENDS_wic_append = " dosfstools-native mtools-native"
+do_image_wic[depends] += "virtual/bootloader:do_deploy mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
 
 UBOOT_MACHINE ?= "nitrogen6q_config"
 
diff --git a/conf/machine/nitrogen7.conf b/conf/machine/nitrogen7.conf
index 30cfb73..83f96cf 100644
--- a/conf/machine/nitrogen7.conf
+++ b/conf/machine/nitrogen7.conf
@@ -29,7 +29,7 @@ IMAGE_BOOT_FILES = " \
     ${KERNEL_IMAGETYPE} \
     ${KERNEL_IMAGETYPE}-imx7d-nitrogen7.dtb;imx7d-nitrogen7.dtb \
 "
-IMAGE_DEPENDS_wic_append = " dosfstools-native mtools-native"
+do_image_wic[depends] += "virtual/bootloader:do_deploy mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
 
 # Boot scripts to install
 BOOT_SCRIPTS = "6x_bootscript-${MACHINE}:6x_bootscript"
-- 
2.7.4