From 6f66d087e7d9c3560601ed969c21f22a1f26f461 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 10 Jul 2017 10:35:19 -0700 Subject: [PATCH] classes/image_types_fsl.bbclass: replace IMAGE_DEPENDS_sdimg by do_image_sdimage[depends] Fixes ERROR: /mnt/a/oe/sources/meta-variscite-fslc/recipes-fsl/images/fsl-image-gui.bb: Deprecated variable(s) found: "IMAGE_DEPENDS_sdcard". Use do_image_[depends] += ":" instead Signed-off-by: Khem Raj Signed-off-by: Otavio Salvador --- classes/image_types_fsl.bbclass | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/classes/image_types_fsl.bbclass b/classes/image_types_fsl.bbclass index 58c1972e..e1970b2a 100644 --- a/classes/image_types_fsl.bbclass +++ b/classes/image_types_fsl.bbclass @@ -12,9 +12,9 @@ UBOOT_SUFFIX_SDCARD ?= "${UBOOT_SUFFIX}" MXSBOOT_NAND_ARGS ?= "" # IMX Bootlets Linux bootstream -IMAGE_DEPENDS_linux.sb = "elftosb-native:do_populate_sysroot \ - imx-bootlets:do_deploy \ - virtual/kernel:do_deploy" +do_image_linux.sb[depends] += "elftosb-native:do_populate_sysroot \ + imx-bootlets:do_deploy \ + virtual/kernel:do_deploy" IMAGE_LINK_NAME_linux.sb = "" IMAGE_CMD_linux.sb () { kernel_bin="`readlink ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin`" @@ -39,10 +39,10 @@ IMAGE_CMD_linux.sb () { } # IMX Bootlets barebox bootstream -IMAGE_DEPENDS_barebox-mxsboot-sdcard = "elftosb-native:do_populate_sysroot \ - u-boot-mxsboot-native:do_populate_sysroot \ - imx-bootlets:do_deploy \ - barebox:do_deploy" +do_image_barebox-mxsboot-sdcard[depends] += "elftosb-native:do_populate_sysroot \ + u-boot-mxsboot-native:do_populate_sysroot \ + imx-bootlets:do_deploy \ + barebox:do_deploy" IMAGE_CMD_barebox-mxsboot-sdcard () { barebox_bd_file=imx-bootlets-barebox_ivt.bd-${MACHINE} @@ -54,13 +54,13 @@ IMAGE_CMD_barebox-mxsboot-sdcard () { # U-Boot mxsboot generation to SD-Card UBOOT_SUFFIX_SDCARD_mxs ?= "mxsboot-sdcard" -IMAGE_DEPENDS_uboot-mxsboot-sdcard = "u-boot-mxsboot-native:do_populate_sysroot \ - u-boot:do_deploy" +do_image_uboot-mxsboot-sdcard[depends] += "u-boot-mxsboot-native:do_populate_sysroot \ + u-boot:do_deploy" IMAGE_CMD_uboot-mxsboot-sdcard = "mxsboot sd ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX} \ ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.uboot-mxsboot-sdcard" -IMAGE_DEPENDS_uboot-mxsboot-nand = "u-boot-mxsboot-native:do_populate_sysroot \ - u-boot:do_deploy" +do_image_uboot-mxsboot-nand[depends] += "u-boot-mxsboot-native:do_populate_sysroot \ + u-boot:do_deploy" IMAGE_CMD_uboot-mxsboot-nand = "mxsboot ${MXSBOOT_NAND_ARGS} nand \ ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX} \ ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.uboot-mxsboot-nand" -- 2.40.1