From fe58cc2394283801d7fecc329a8d6e278373938a Mon Sep 17 00:00:00 2001 From: Anton Gerasimov Date: Thu, 20 Apr 2017 18:16:47 +0200 Subject: Don't build wic unless IMAGE_BOOT_FILES is set --- conf/distro/sota.conf.inc | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'conf/distro/sota.conf.inc') diff --git a/conf/distro/sota.conf.inc b/conf/distro/sota.conf.inc index a2d8184..5ec1d18 100644 --- a/conf/distro/sota.conf.inc +++ b/conf/distro/sota.conf.inc @@ -5,19 +5,16 @@ IMAGE_INSTALL_append = " ostree os-release" # live image for OSTree-enabled systems IMAGE_CLASSES += "image_types_ostree image_types_ota" -IMAGE_FSTYPES += "ostreepush otaimg wic" +IMAGE_FSTYPES += "ostreepush otaimg" + +# if don't build wic image unless IMAGE_BOOT_FILES is set. Prevents build from failing +# on machines that don't support updater yet +IMAGE_FSTYPES += "${@' wic' if (d.getVar("IMAGE_BOOT_FILES", True)) else ''}" WKS_FILE ?= "sdimage-sota.wks" do_image_wic[depends] += "${IMAGE_BASENAME}:do_image_otaimg" EXTRA_IMAGEDEPENDS += " parted-native mtools-native dosfstools-native" -# No working WKS for Raspberry Pi yet -IMAGE_FSTYPES_remove_raspberrypi3 = "wic" -IMAGE_FSTYPES_remove_raspberrypi2 = "wic" - -# QEMU emulation uses plain otaimg, no wic needed -IMAGE_FSTYPES_remove_qemux86-64 = "wic" - # Please redefine OSTREE_REPO in order to have a persistent OSTree repo OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo" OSTREE_BRANCHNAME ?= "ota-${MACHINE}" -- cgit v1.2.3-54-g00ecf