From a84d6a40c1c786c64824e8e13b289fccc0b32b92 Mon Sep 17 00:00:00 2001 From: Enrico Butera Date: Wed, 26 Apr 2017 23:34:47 +0200 Subject: [PATCH] sdcard_image-sunxi: fix dependency loop As suggested by Andrei Gherzan (see #178): "The current implementation inherits sdcard_image-sunxi.bbclass unconditionally which in turn, sets two depends on do_rootfs unconditionally again. This means that if I want to build an initramfs image in the kernel image I will get a dependency loop." Signed-off-by: Enrico Butera --- classes/sdcard_image-sunxi.bbclass | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/classes/sdcard_image-sunxi.bbclass b/classes/sdcard_image-sunxi.bbclass index 3548534..d97200c 100644 --- a/classes/sdcard_image-sunxi.bbclass +++ b/classes/sdcard_image-sunxi.bbclass @@ -33,13 +33,10 @@ IMAGE_DEPENDS_sunxi-sdimg += " \ parted-native \ mtools-native \ dosfstools-native \ - virtual/kernel \ - virtual/bootloader \ + virtual/kernel:do_deploy \ + virtual/bootloader:do_deploy \ " -do_rootfs[depends] += "virtual/kernel:do_deploy" -do_rootfs[depends] += "virtual/bootloader:do_deploy" - # SD card image name SDIMG = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.sunxi-sdimg"