diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2017-04-06 17:48:17 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-04-10 23:00:43 +0100 |
commit | 88cd926de2894da7f13e5039c1d9cff4a4181280 (patch) | |
tree | 02fea260d87c665851bc1c30dfa300a4c3cb0ec8 /meta/conf | |
parent | f70179e280b5f518ae160f0d14496f2a730c8140 (diff) | |
download | poky-88cd926de2894da7f13e5039c1d9cff4a4181280.tar.gz |
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 <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/machine/qemux86-64.conf | 2 | ||||
-rw-r--r-- | meta/conf/machine/qemux86.conf | 2 |
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" | |||
30 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" | 30 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" |
31 | 31 | ||
32 | WKS_FILE ?= "directdisk.wks" | 32 | WKS_FILE ?= "directdisk.wks" |
33 | do_image_wic[depends] += "syslinux:do_build syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" | 33 | 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" | |||
29 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" | 29 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" |
30 | 30 | ||
31 | WKS_FILE ?= "directdisk.wks" | 31 | WKS_FILE ?= "directdisk.wks" |
32 | do_image_wic[depends] += "syslinux:do_build syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" | 32 | do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" |