summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-04-06 17:48:17 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-04-08 22:48:06 +0100
commitb7bb02901b7002641a8e8cc3fc0b6ec31e5a21f7 (patch)
treecef11c7eee24d1482dd6ec371911297f54966296
parent7a7fcbab0365b9501c737dbc02715be14dda72a3 (diff)
downloadopenembedded-core-contrib-b7bb02901b7002641a8e8cc3fc0b6ec31e5a21f7.tar.gz
openembedded-core-contrib-b7bb02901b7002641a8e8cc3fc0b6ec31e5a21f7.tar.bz2
openembedded-core-contrib-b7bb02901b7002641a8e8cc3fc0b6ec31e5a21f7.zip
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 <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/machine/qemux86-64.conf2
-rw-r--r--meta/conf/machine/qemux86.conf2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index 150d745436..10189cb5c3 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -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"
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"