diff options
| author | Ming Liu <ming.liu@toradex.com> | 2019-08-09 17:05:04 +0800 |
|---|---|---|
| committer | Ming Liu <ming.liu@toradex.int> | 2019-08-20 09:02:03 +0000 |
| commit | f209fd39a5d876fa9d66be0da92d33e346e3a1bb (patch) | |
| tree | b06e0176f126be63160a34c92084ddb991f981e1 | |
| parent | 51b02b17852e2232f62d90c13df4391ee2e375aa (diff) | |
meta: drop useless EXTRA_IMAGEDEPENDS
For the recipes listed in EXTRA_IMAGEDEPENDS, bitbake would create a
dependency as:
| image_pn:do_image_complete -> imagedepends_pn:do_populate_sysroot
but we actually need a image task depend on the deploy tasks of
EXTRA_IMAGEDEPENDS recipes, setting EXTRA_IMAGEDEPENDS would not help
with that, so drop it, use WKS_FILE_DEPENDS instead.
We also need drop "IMAGE_BOOT_FILES +=", that would override
"WKS_FILE_DEPENDS ?=".
Signed-off-by: Ming Liu <ming.liu@toradex.com>
| -rw-r--r-- | conf/machine/apalis-tk1-mainline.conf | 9 | ||||
| -rw-r--r-- | conf/machine/apalis-tk1.conf | 8 |
2 files changed, 9 insertions, 8 deletions
diff --git a/conf/machine/apalis-tk1-mainline.conf b/conf/machine/apalis-tk1-mainline.conf index 92f2192..65f2a7b 100644 --- a/conf/machine/apalis-tk1-mainline.conf +++ b/conf/machine/apalis-tk1-mainline.conf @@ -10,23 +10,24 @@ require conf/machine/include/soc-family.inc SOC_FAMILY = "tegra124m" -EXTRA_IMAGEDEPENDS += "u-boot-distro-boot" -IMAGE_BOOT_FILES += "${MACHINE_BOOT_FILES}" -MACHINE_BOOT_FILES = "boot.scr" - PREFERRED_PROVIDER_virtual/kernel = "linux-toradex-mainline" KERNEL_IMAGETYPE = "zImage" KERNEL_DEFCONFIG = "tegra_defconfig" KERNEL_DEVICETREE += "tegra124-apalis-eval.dtb tegra124-apalis-v1.2-eval.dtb" +MACHINE_BOOT_FILES = "boot.scr" + # wic support IMAGE_BOOT_FILES ?= " \ ${KERNEL_IMAGETYPE} \ ${KERNEL_DEVICETREE} \ + ${MACHINE_BOOT_FILES} \ " + WKS_FILE_DEPENDS ?= " \ virtual/bootloader \ + u-boot-distro-boot \ \ e2fsprogs-native \ bmap-tools-native \ diff --git a/conf/machine/apalis-tk1.conf b/conf/machine/apalis-tk1.conf index bb5124a..1a17720 100644 --- a/conf/machine/apalis-tk1.conf +++ b/conf/machine/apalis-tk1.conf @@ -10,22 +10,22 @@ require conf/machine/include/soc-family.inc SOC_FAMILY = "tegra124" -EXTRA_IMAGEDEPENDS += "u-boot-distro-boot" -IMAGE_BOOT_FILES += "${MACHINE_BOOT_FILES}" -MACHINE_BOOT_FILES = "boot.scr" - PREFERRED_PROVIDER_virtual/kernel = "linux-toradex" KERNEL_IMAGETYPE = "zImage" KERNEL_DEVICETREE += "tegra124-apalis-eval.dtb tegra124-apalis-v1.2-eval.dtb" +MACHINE_BOOT_FILES = "boot.scr" + # wic support IMAGE_BOOT_FILES ?= " \ ${KERNEL_IMAGETYPE} \ ${KERNEL_DEVICETREE} \ + ${MACHINE_BOOT_FILES} \ " WKS_FILE_DEPENDS ?= " \ virtual/bootloader \ + u-boot-distro-boot \ \ e2fsprogs-native \ bmap-tools-native \ |