agl-sota: Add netboot to CONFLICT_DISTRO_FEATURES

[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..3ceb04d 100644 (file)
--- 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"