X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=templates%2Ffeature%2Fagl-sota%2F50_local.conf.inc;h=3ceb04df729e22f01b797fd40f4c064034d363ec;hb=355db554424ad14115029c31c676d731aa3c95d8;hp=477694aedb9cd8ab9a7ec2ef86cface293f0ec0f;hpb=df4ed283e18f3dfe9f42f0012b12cb0af57bcdbb;p=AGL%2Fmeta-agl.git

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"