From 1c7d6584a7811b7785ae5c1e378f14b5ba0971cf Mon Sep 17 00:00:00 2001 From: takeshi_hoshina Date: Mon, 2 Nov 2020 11:07:33 +0900 Subject: basesystem-jj recipes --- meta-agl/templates/feature/agl-sota/50_local.conf.inc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'meta-agl/templates/feature/agl-sota/50_local.conf.inc') diff --git a/meta-agl/templates/feature/agl-sota/50_local.conf.inc b/meta-agl/templates/feature/agl-sota/50_local.conf.inc index 35ab3f9a..3ceb04df 100644 --- a/meta-agl/templates/feature/agl-sota/50_local.conf.inc +++ b/meta-agl/templates/feature/agl-sota/50_local.conf.inc @@ -1,10 +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" -# rpi4 and recent rpi3 firmwares need dtb in /boot partition -# so that they can be read by the firmware. This fixes UART -# issues for Raspberry Pi 3. For branches based on release -# Thud this fix is not present in meta-updater. -IMAGE_BOOT_FILES_append_rpi = "${@make_dtb_boot_files(d)}" +# Netboot is not obeying usrmerge distro feature +# therefore it is not compatible with agl-sota +CONFLICT_DISTRO_FEATURES += "netboot" -- cgit 1.2.3-korg