diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-08-12 11:31:11 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-08-13 09:29:15 +0100 |
| commit | 6f0a78e04b2bf95e7a694df0f8efb124579d2311 (patch) | |
| tree | 2efbdc71f27167ad9e257a37d93548cbb20d2dae /meta/conf/bitbake.conf | |
| parent | 17057fee50052b7c011b35fd1d830dd3230d9093 (diff) | |
| download | poky-6f0a78e04b2bf95e7a694df0f8efb124579d2311.tar.gz | |
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.
(From OE-Core rev: fb22a7e7ee38a0e923e86a68d0e9b86d479f264d)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/bitbake.conf')
| -rw-r--r-- | meta/conf/bitbake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index c09c0a7d52..1acb56433c 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
| @@ -829,12 +829,12 @@ include conf/local.conf | |||
| 829 | require conf/multiconfig/${BB_CURRENT_MC}.conf | 829 | require conf/multiconfig/${BB_CURRENT_MC}.conf |
| 830 | include conf/machine/${MACHINE}.conf | 830 | include conf/machine/${MACHINE}.conf |
| 831 | include conf/machine-sdk/${SDKMACHINE}.conf | 831 | include conf/machine-sdk/${SDKMACHINE}.conf |
| 832 | require conf/cve-check-map.conf | ||
| 832 | include conf/distro/${DISTRO}.conf | 833 | include conf/distro/${DISTRO}.conf |
| 833 | include conf/distro/defaultsetup.conf | 834 | include conf/distro/defaultsetup.conf |
| 834 | include conf/documentation.conf | 835 | include conf/documentation.conf |
| 835 | include conf/licenses.conf | 836 | include conf/licenses.conf |
| 836 | require conf/sanity.conf | 837 | require conf/sanity.conf |
| 837 | require conf/cve-check-map.conf | ||
| 838 | include conf/bblock.conf | 838 | include conf/bblock.conf |
| 839 | 839 | ||
| 840 | ################################################################## | 840 | ################################################################## |
