intel: build hddimg by default

The useful mkefi.sh script requires an hddimg image, so we should build
hddimg's by default for Intel builds.

While we're at it, drop live per Jan-Simon's recommendations, so that we
have just wic and hddimg.

Change-Id: I24bfc03e9f357f3b8784267cc4537e4ff07d236e
Signed-off-by: Martin Kelly <mkelly@xevo.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/10567
Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-boot-test: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>

diff --git a/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc b/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc
index 47d5a5f..069dbea 100644 (file)
--- a/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc
+++ b/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc
@@ -24,6 +24,6 @@ IMAGE_INSTALL_append = " \
         va-intel \
         gstreamer-vaapi-1.0 "
 
-AGL_DEFAULT_IMAGE_FSTYPES := "live wic"
+AGL_DEFAULT_IMAGE_FSTYPES := "wic hddimg"
 AGL_DEFAULT_INITRAMFS_FSTYPES := "cpio.gz"
 NOISO = "1"

diff --git a/meta-agl-bsp/conf/include/agl_joule.inc b/meta-agl-bsp/conf/include/agl_joule.inc
index 014ce43..9f4e79b 100644 (file)
--- a/meta-agl-bsp/conf/include/agl_joule.inc
+++ b/meta-agl-bsp/conf/include/agl_joule.inc
@@ -10,6 +10,6 @@ IMAGE_INSTALL_append = " \
         gstreamer-vaapi-1.0 "
 OSTREE_BOOTLOADER ?= "u-boot"
 
-AGL_DEFAULT_IMAGE_FSTYPES := "live wic"
+AGL_DEFAULT_IMAGE_FSTYPES := "wic hddimg"
 AGL_DEFAULT_INITRAMFS_FSTYPES := "cpio.gz"
 NOISO = "1"