image classes: use PN for depends, not IMAGE_BASE_NAME
Some images override IMAGE_BASE_NAME in the recipe causing targets using image-{live,vmdk} to fail. (From OE-Core rev: 7e000fef0bf917f27dcad66dd90fae6c155c4d1d) Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
5ce6418c13
commit
e2143b3739
|
@ -10,6 +10,6 @@ LABELS_append = " ${SYSLINUX_LABELS} "
|
||||||
ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3"
|
ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3"
|
||||||
|
|
||||||
do_bootimg[depends] += "${INITRD_IMAGE}:do_rootfs"
|
do_bootimg[depends] += "${INITRD_IMAGE}:do_rootfs"
|
||||||
do_bootimg[depends] += "${IMAGE_BASENAME}:do_rootfs"
|
do_bootimg[depends] += "${PN}:do_rootfs"
|
||||||
|
|
||||||
inherit bootimg
|
inherit bootimg
|
||||||
|
|
|
@ -8,7 +8,7 @@ SYSLINUX_LABELS = "boot"
|
||||||
LABELS_append = " ${SYSLINUX_LABELS} "
|
LABELS_append = " ${SYSLINUX_LABELS} "
|
||||||
|
|
||||||
# need to define the dependency and the ROOTFS for directdisk
|
# need to define the dependency and the ROOTFS for directdisk
|
||||||
do_bootdirectdisk[depends] += "${IMAGE_BASENAME}:do_rootfs"
|
do_bootdirectdisk[depends] += "${PN}:do_rootfs"
|
||||||
ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3"
|
ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3"
|
||||||
|
|
||||||
# creating VMDK relies on having a live hddimg so ensure we
|
# creating VMDK relies on having a live hddimg so ensure we
|
||||||
|
|
Loading…
Reference in New Issue