aboutsummaryrefslogtreecommitdiffstats
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>2017-01-11 17:21:43 +0000
commit14f514d93c5e6530fbff64fa5a74f721e8807c27 (patch)
treea229f8052dace8994d5e8c77e5c7a7767885ef7a
parent793092d1a19a5f2ec89a77ca4ccd8764cc6b9c0f (diff)
downloadopenembedded-core-contrib-14f514d93c5e6530fbff64fa5a74f721e8807c27.tar.gz
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) (From OE-Core rev: 3d99674a712cf06c62aa3a98b6696d430547fcec) 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> Signed-off-by: Armin Kuster <akuster808@gmail.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 b191ddd3cb..084551db6a 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -31,3 +31,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 8555fd6bfe..5cf024942f 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -30,3 +30,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"