Code Review / AGL / meta-agl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 19ae581)
50_local.conf.inc: Extend DISTRO_FEATURES for sota 07/22307/1
authorLeon Anavi <leon.anavi@konsulko.com>
Fri, 9 Aug 2019 13:37:48 +0000 (16:37 +0300)
committerScott Murray <scott.murray@konsulko.com>
Tue, 3 Sep 2019 16:15:03 +0000 (16:15 +0000)
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)

templates/feature/agl-sota/50_local.conf.inc patch | blob | history

diff --git a/templates/feature/agl-sota/50_local.conf.inc b/templates/feature/agl-sota/50_local.conf.inc
index 0624303..509cf61 100644 (file)
--- 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"
meta-agl layer (core AGL)