summaryrefslogtreecommitdiffstats
path: root/templates/feature/agl-sota
diff options
context:
space:
mode:
Diffstat (limited to 'templates/feature/agl-sota')
-rw-r--r--templates/feature/agl-sota/50_local.conf.inc5
1 files changed, 4 insertions, 1 deletions
diff --git a/templates/feature/agl-sota/50_local.conf.inc b/templates/feature/agl-sota/50_local.conf.inc
index 477694aed..3ceb04df7 100644
--- a/templates/feature/agl-sota/50_local.conf.inc
+++ b/templates/feature/agl-sota/50_local.conf.inc
@@ -1,5 +1,8 @@
-#see meta-updater/conf/distro/sota.conf.inc
+# See meta-updater/conf/distro/sota.conf.inc
INHERIT += "sota"
DISTRO_FEATURES_append = " sota usrmerge"
DISTRO_FEATURES_NATIVE_append = " sota"
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"