summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-11-24 16:40:38 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-30 15:48:07 +0000
commit8a00c404ab7717c50bc43d12b78bede1d68c109e (patch)
treeab417a8d655e5c9ba445923bf9a661e3322c7032
parent80f9d337615639fe852ddcb96ce9de929958d945 (diff)
downloadopenembedded-core-contrib-8a00c404ab7717c50bc43d12b78bede1d68c109e.tar.gz
openembedded-core-contrib-8a00c404ab7717c50bc43d12b78bede1d68c109e.tar.bz2
openembedded-core-contrib-8a00c404ab7717c50bc43d12b78bede1d68c109e.zip
qemux86*.conf: set wic-related parameters
Set directdisk.wks as default wks to use for qemux86 machines. Set requried dependeincies to build directdisk image. This should simplify building wic images for qemux86* machines. It should be enough to add wic to the list of IMAGE_FSTYPES to get the images built. [YOCTO #10637, YOCTO #8719] (From OE-Core rev: 8716b8b9be05e3f140bfa426a8e0d4eeaa2edcbe) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/machine/qemux86-64.conf3
-rw-r--r--meta/conf/machine/qemux86.conf3
2 files changed, 6 insertions, 0 deletions
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index f2b2aebf95..755972489f 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -28,3 +28,6 @@ XSERVER = "xserver-xorg \
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"
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index 09555ad548..77859994c9 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -27,3 +27,6 @@ XSERVER = "xserver-xorg \
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"