summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorLeon Anavi <leon.anavi@konsulko.com>2019-08-09 16:37:48 +0300
committerScott Murray <scott.murray@konsulko.com>2019-09-03 16:15:03 +0000
commitbcd7b635ba26974cdf9632f214078d8079cc9a3c (patch)
tree03d14619431096d5cdb6b58c48aa9bd42f465948 /templates
parent19ae581068d953ae0339a47ee0e12b082f85f25a (diff)
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)
Diffstat (limited to 'templates')
-rw-r--r--templates/feature/agl-sota/50_local.conf.inc2
1 files changed, 2 insertions, 0 deletions
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"