From: Leon Anavi <leon.anavi@konsulko.com>
Date: Fri, 9 Aug 2019 13:37:48 +0000 (+0300)
Subject: 50_local.conf.inc: Extend DISTRO_FEATURES for sota
X-Git-Tag: halibut_8.0.1~2
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;ds=inline;h=refs%2Fchanges%2F07%2F22307%2F1;p=AGL%2Fmeta-agl.git

50_local.conf.inc: Extend DISTRO_FEATURES for sota

Extend DISTRO_FEATURES with sota and usrmerge to successfully
build AGL image with feature agl-sota.

Bug-AGL: SPEC-2736, SPEC-2729

Change-Id: Ie056d233f1c528719361a8c958233a2ba58f7345
Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
(cherry picked from commit 73b849c0d72f94eb1c0db582a9dc684123793960)
---

diff --git a/templates/feature/agl-sota/50_local.conf.inc b/templates/feature/agl-sota/50_local.conf.inc
index 0624303ed..509cf6125 100644
--- a/templates/feature/agl-sota/50_local.conf.inc
+++ b/templates/feature/agl-sota/50_local.conf.inc
@@ -1,2 +1,4 @@
 #see meta-updater/conf/distro/sota.conf.inc
 INHERIT += "sota"
+DISTRO_FEATURES_append = " sota usrmerge"
+DISTRO_FEATURES_NATIVE_append = " sota"