MIRRORS/meta-freescale-3rdparty
1
0
Fork 0
mirror of https://github.com/Freescale/meta-freescale-3rdparty.git synced 2025-07-19 12:09:01 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Replace deprecated IMAGE_DEPENDS_wic with WKS_FILE_DEPENDS

Browse Source 
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@ossystems.com.br>
Tested-by: Eric Nelson <eric@nelint.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
This commit is contained in:
Fabio Berton 2017-08-23 09:41:55 -03:00 committed by Otavio Salvador
parent 081f9b4441
commit 3fb59e4d6f
7 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conf/machine/cubox-i.conf
View File

@ -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"

3
conf/machine/imx6dl-riotboard.conf
View File

@ -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"

2
conf/machine/nitrogen6sx.conf
View File

@ -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"

2
conf/machine/nitrogen6x-lite.conf
View File

@ -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"

2
conf/machine/nitrogen6x.conf
View File

@ -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"

2
conf/machine/nitrogen7.conf
View File

@ -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"

3
conf/machine/wandboard.conf
View File

@ -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"