From b803c02425123eec9ad22c8c632197bcaab4980a Mon Sep 17 00:00:00 2001 From: Leon Anavi Date: Tue, 18 Feb 2020 10:34:54 +0200 Subject: agl-sota: Add netboot to CONFLICT_DISTRO_FEATURES Netboot is not obeying usrmerge distro feature therefore it is not compatible with agl-sota. Bug-AGL: SPEC-3097, SPEC-3130 Change-Id: I8beda358df90b5fc052b68964f4c27379622f2d3 Suggested-by: Jan-Simon Moeller Signed-off-by: Leon Anavi --- templates/feature/agl-sota/50_local.conf.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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" -- cgit 1.2.3-korg