From 7e4e1c69df14e8a79666815d5dc3415422c0e7c4 Mon Sep 17 00:00:00 2001 From: Martin Kelly Date: Mon, 7 Aug 2017 17:03:38 -0700 Subject: 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 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/10565 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller --- meta-agl-bsp/conf/include/agl_intel-corei7-64.inc | 2 +- meta-agl-bsp/conf/include/agl_joule.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 47d5a5f45..069dbea50 100644 --- 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 014ce436a..9f4e79ba6 100644 --- 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" -- cgit 1.2.3-korg