Skip to contentSkip to conversation

conf/bitbake.conf: move addfragments to just after the local.conf include

PATCH New Alexander Kanavin 1 participant 1 message Dec 27, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 conf/bitbake.conf: move addfragments to just after the local.conf include

From: Alexander Kanavin <[email protected]>

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.

---
 meta/conf/bitbake.conf | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
meta/conf/bitbake.conf +5 -3
index 0ed0766cd2f..16e4f4429f8 100644
@@ -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)
Signature · 1 line
2.39.5