From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Mon, 12 Aug 2024 10:31:11 +0000 (+0100)
Subject: bitbake.conf: Include cve-check-map earlier, before distro
X-Git-Tag: yocto-5.1~310
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb22a7e7ee38a0e923e86a68d0e9b86d479f264d;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

bitbake.conf: Include cve-check-map earlier, before distro

It makes sense for the distro to be able to override "policy" from cve-check-map
which is intented to provide defaults. Tweak the ordering to allow for this,
ensuring it is included before the distro includes.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index c09c0a7d52c..1acb56433c2 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -829,12 +829,12 @@ include conf/local.conf
 require conf/multiconfig/${BB_CURRENT_MC}.conf
 include conf/machine/${MACHINE}.conf
 include conf/machine-sdk/${SDKMACHINE}.conf
+require conf/cve-check-map.conf
 include conf/distro/${DISTRO}.conf
 include conf/distro/defaultsetup.conf
 include conf/documentation.conf
 include conf/licenses.conf
 require conf/sanity.conf
-require conf/cve-check-map.conf
 include conf/bblock.conf
 
 ##################################################################