qemux86*.conf: changed dependency task for syslinux

PATCH New Ed Bartosh 1 participant 1 message Apr 6, 2017

Share & tools

Ed Bartosh

author

2017-04-06 14:49 UTC #0 lore raw

PATCH 1/1 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]

Signed-off-by Ed Bartosh <[email protected]>

---
 meta/conf/machine/qemux86-64.conf | 2 +-
 meta/conf/machine/qemux86.conf    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

meta/conf/machine/qemux86-64.conf +1 -1

index 150d745..10189cb 100644
@@ -30,4 +30,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"

meta/conf/machine/qemux86.conf +1 -1

index 1b478e9..c26dda2 100644
@@ -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"

Signature · 1 line

2.1.4