[meta-freescale] [3rdparty][PATCH] Replace deprecated IMAGE_DEPENDS_wic with WKS_FILE_DEPENDS

[Fabio Berton]

IMAGE_DEPENDS_wic_append is deprecated and to install wic dependencies
we need to set WKS_FILE_DEPENDS variable. We don't need to add u-boot
to WKS_FILE_DEPENDS for machines that has u-boot in
MACHINE_ESSENTIAL_EXTRA_RDEPENDS variable. The only dependency to create
wic images is parted-native and is already provided by image_types_wic
class, we can set WKS_FILE_DEPENDS to void and don't build any dependency.

Signed-off-by: Fabio Berton <fabio.berton at ossystems.com.br>
---
 conf/machine/cubox-i.conf          | 3 +--
 conf/machine/imx6dl-riotboard.conf | 3 +--
 conf/machine/nitrogen6sx.conf      | 2 +-
 conf/machine/nitrogen6x-lite.conf  | 2 +-
 conf/machine/nitrogen6x.conf       | 2 +-
 conf/machine/nitrogen7.conf        | 2 +-
 conf/machine/wandboard.conf        | 3 +--
 7 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/conf/machine/cubox-i.conf b/conf/machine/cubox-i.conf
index af45c38..24e8519 100644
--- a/conf/machine/cubox-i.conf
+++ b/conf/machine/cubox-i.conf
@@ -42,7 +42,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \
 "
 
 WKS_FILES ?= "imx-uboot-spl.wks"
-
-IMAGE_DEPENDS_wic_append = " virtual/bootloader"
+WKS_FILE_DEPENDS ?= ""
 
 IMAGE_FSTYPES = "wic.gz"
diff --git a/conf/machine/imx6dl-riotboard.conf b/conf/machine/imx6dl-riotboard.conf
index 6cc4f8c..7823cd5 100644
--- a/conf/machine/imx6dl-riotboard.conf
+++ b/conf/machine/imx6dl-riotboard.conf
@@ -23,7 +23,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \
 "
 
 WKS_FILES ?= "imx-uboot.wks"
-
-IMAGE_DEPENDS_wic_append = " virtual/bootloader"
+WKS_FILE_DEPENDS ?= ""
 
 IMAGE_FSTYPES = "wic.gz"
diff --git a/conf/machine/nitrogen6sx.conf b/conf/machine/nitrogen6sx.conf
index 45b79f4..ae6fff2 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"
+WKS_FILE_DEPENDS ?= ""
 
 # 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..5a120c3 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"
+WKS_FILE_DEPENDS ?= ""
 
 # 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..aa6f1ba 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"
+WKS_FILE_DEPENDS ?= ""
 
 UBOOT_MACHINE ?= "nitrogen6q_config"
 
diff --git a/conf/machine/nitrogen7.conf b/conf/machine/nitrogen7.conf
index 30cfb73..2382c13 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"
+WKS_FILE_DEPENDS ?= ""
 
 # Boot scripts to install
 BOOT_SCRIPTS = "6x_bootscript-${MACHINE}:6x_bootscript"
diff --git a/conf/machine/wandboard.conf b/conf/machine/wandboard.conf
index 485b06e..a3b04ea 100644
--- a/conf/machine/wandboard.conf
+++ b/conf/machine/wandboard.conf
@@ -51,7 +51,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \
 "
 
 WKS_FILES ?= "imx-uboot-spl.wks"
-
-do_image_wic[depends] += "virtual/bootloader:do_deploy"
+WKS_FILE_DEPENDS ?= ""
 
 SOC_DEFAULT_IMAGE_FSTYPES = "wic.gz"
-- 
2.11.0