From 82a3c13a0b0c9979fa0812143d619748aa89c85d Mon Sep 17 00:00:00 2001 From: Anton Gerasimov Date: Mon, 3 Apr 2017 12:08:39 +0200 Subject: Replace TEMPLATECONF with agl-like config snippets --- conf/distro/sota.conf.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'conf/distro/sota.conf.inc') diff --git a/conf/distro/sota.conf.inc b/conf/distro/sota.conf.inc index c8b4388..55e9cac 100644 --- a/conf/distro/sota.conf.inc +++ b/conf/distro/sota.conf.inc @@ -1,7 +1,7 @@ DISTRO_FEATURES_append = " sota" OVERRIDES .= ":sota" -IMAGE_INSTALL_append = " ostree" +IMAGE_INSTALL_append = " ostree os-release" # live image for OSTree-enabled systems IMAGE_CLASSES += "image_types_ostree image_types_ota" @@ -13,6 +13,9 @@ do_image_wic[depends] += "${IMAGE_BASENAME}:do_image_otaimg" 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