X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=templates%2Ffeature%2Fagl-sota%2F50_local.conf.inc;h=8019022c4842a182c9a8cb24ec464be8c2e0bbda;hb=bad73bf315325c3428e331984f9d17bb8b2873b3;hp=29548aefae7c3d998dd38142befdff849f0ec27f;hpb=d9a02b96ebbf689395521d95f712107bf2631867;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 29548aefa..8019022c4 100644
--- a/templates/feature/agl-sota/50_local.conf.inc
+++ b/templates/feature/agl-sota/50_local.conf.inc
@@ -1,2 +1,8 @@
-#see meta-updater/conf/distro/sota.conf.inc
-INHERIT += " sota"
+# 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"