mirror of
https://git.yoctoproject.org/poky
synced 2026-07-16 15:57:04 +00:00
bitbake.conf,lib/configfragments: Use a new dedicated toolcfg.conf file
Rather than using auto.conf which already has established use in CI, or local.conf which users expect to own/control, start writing "tooling" controlled settings to a toolcfg.conf. This frees CI to handle auto.conf as it wants, but avoids the tooling breaking users local.conf files. (From OE-Core rev: 3f8616e56b604d7b77a12334a6ce76d265de7323) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -813,6 +813,7 @@ FILESOVERRIDES = "${TRANSLATED_TARGET_ARCH}:${MACHINEOVERRIDES}:${DISTROOVERRIDE
|
||||
require conf/abi_version.conf
|
||||
include conf/site.conf
|
||||
include conf/auto.conf
|
||||
include conf/toolcfg.conf
|
||||
include conf/local.conf
|
||||
|
||||
OE_FRAGMENTS_PREFIX ?= "conf/fragments"
|
||||
|
||||
@@ -115,7 +115,7 @@ class ConfigFragmentsPlugin(LayerPlugin):
|
||||
def create_conf(self, confpath):
|
||||
if not os.path.exists(confpath):
|
||||
with open(confpath, 'w') as f:
|
||||
f.write('')
|
||||
f.write('# Automated config file controlled by tools\n')
|
||||
with open(confpath, 'r') as f:
|
||||
lines = f.read()
|
||||
if "OE_FRAGMENTS += " not in lines:
|
||||
@@ -184,7 +184,7 @@ class ConfigFragmentsPlugin(LayerPlugin):
|
||||
print("All fragments removed from {}.".format(args.confpath))
|
||||
|
||||
def register_commands(self, sp):
|
||||
default_confpath = os.path.join(os.environ["BBPATH"], "conf/auto.conf")
|
||||
default_confpath = os.path.join(os.environ["BBPATH"], "conf/toolcfg.conf")
|
||||
|
||||
parser_list_fragments = self.add_command(sp, 'list-fragments', self.do_list_fragments, parserecipes=False)
|
||||
parser_list_fragments.add_argument("--confpath", default=default_confpath, help='Configuration file which contains a list of enabled fragments (default is {}).'.format(default_confpath))
|
||||
|
||||
Reference in New Issue
Block a user