Code Review
/
AGL
/
meta-agl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Prepare Lucky Lamprey 12.1.18
[AGL/meta-agl.git]
/
templates
/
feature
/
agl-sota
/
50_local.conf.inc
diff --git
a/templates/feature/agl-sota/50_local.conf.inc
b/templates/feature/agl-sota/50_local.conf.inc
index
477694a
..
8019022
100644
(file)
--- a/
templates/feature/agl-sota/50_local.conf.inc
+++ b/
templates/feature/agl-sota/50_local.conf.inc
@@
-1,5
+1,8
@@
-#
s
ee meta-updater/conf/distro/sota.conf.inc
+#
S
ee meta-updater/conf/distro/sota.conf.inc
INHERIT += "sota"
INHERIT += "sota"
-DISTRO_FEATURES
_
append = " sota usrmerge"
-DISTRO_FEATURES_NATIVE
_
append = " sota"
+DISTRO_FEATURES
:
append = " sota usrmerge"
+DISTRO_FEATURES_NATIVE
:
append = " sota"
AGL_DEFAULT_INITRAMFS_FSTYPES = "cpio.gz"
AGL_DEFAULT_INITRAMFS_FSTYPES = "cpio.gz"
+# Netboot is not obeying usrmerge distro feature
+# therefore it is not compatible with agl-sota
+CONFLICT_DISTRO_FEATURES += "netboot"