From b1671dac9f96445f8692540f84a49f77e47819ad Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 27 Dec 2024 19:43:52 +0100 Subject: conf/bitbake.conf: move addfragments to just after the local.conf include There was a report that the existing addfragments statement comes in too late, specifically after the DISTRO/MACHINE includes have already been handled. The goal for fragments content is to behave exactly like the settings in local.conf would and so we need to handle the fragments just after that file. (From OE-Core rev: e820fa96d078478ea3510164373989090e8c9419) Signed-off-by: Alexander Kanavin Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- meta/conf/bitbake.conf | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 0ed0766cd2..16e4f4429f 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -827,6 +827,11 @@ require conf/abi_version.conf include conf/site.conf include conf/auto.conf include conf/local.conf + +OE_FRAGMENTS_PREFIX ?= "conf/fragments" +OE_FRAGMENTS_METADATA_VARS ?= "BB_CONF_FRAGMENT_SUMMARY BB_CONF_FRAGMENT_DESCRIPTION" +addfragments ${OE_FRAGMENTS_PREFIX} OE_FRAGMENTS OE_FRAGMENTS_METADATA_VARS + require conf/multiconfig/${BB_CURRENT_MC}.conf include conf/machine/${MACHINE}.conf include conf/machine-sdk/${SDKMACHINE}.conf @@ -837,9 +842,6 @@ include conf/documentation.conf include conf/licenses.conf require conf/sanity.conf include conf/bblock.conf -OE_FRAGMENTS_PREFIX ?= "conf/fragments" -OE_FRAGMENTS_METADATA_VARS ?= "BB_CONF_FRAGMENT_SUMMARY BB_CONF_FRAGMENT_DESCRIPTION" -addfragments ${OE_FRAGMENTS_PREFIX} OE_FRAGMENTS OE_FRAGMENTS_METADATA_VARS ################################################################## # Weak variables (usually to retain backwards compatibility) -- cgit v1.2.3-54-g00ecf