From 88cd926de2894da7f13e5039c1d9cff4a4181280 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Thu, 6 Apr 2017 17:48:17 +0300 Subject: qemux86*.conf: changed dependency task for syslinux Changed dependency task for syslinux from do_build to do_populate_sysroot as do_build dependency caused conflicts in populating image recipe sysroot using conflicting recipes. This makes do_image_wic task to fail with FileExistsError trying to copy the same file from two conflicting recipes. This should also speed up image creation a bit as do_populate_sysroot task is faster than do_build. [YOCTO #11295] (From OE-Core rev: b7bb02901b7002641a8e8cc3fc0b6ec31e5a21f7) Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- meta/conf/machine/qemux86.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/conf/machine/qemux86.conf') diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf index 1b478e92ad..c26dda27fc 100644 --- a/meta/conf/machine/qemux86.conf +++ b/meta/conf/machine/qemux86.conf @@ -29,4 +29,4 @@ MACHINE_FEATURES += "x86" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" WKS_FILE ?= "directdisk.wks" -do_image_wic[depends] += "syslinux:do_build syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" +do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" -- cgit v1.2.3-54-g00ecf