Signed-off-by: Alexander Kanavin <[email protected]>
---
meta/lib/bblayers/buildconf.py | 12 +++++++++---
meta/lib/oeqa/selftest/cases/bblayers.py | 2 +-
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/meta/lib/bblayers/buildconf.py b/meta/lib/bblayers/buildconf.py
index 87a5e5a55bc..722cf0723c1 100644
--- a/meta/lib/bblayers/buildconf.py
+++ b/meta/lib/bblayers/buildconf.py
@@ -20,7 +20,10 @@ def plugin_init(plugins):
return BuildConfPlugin()
class BuildConfPlugin(LayerPlugin):
- notes_fixme = """FIXME: Please place here the description of this build
configuration.
+ notes_fixme = """FIXME: Please place here the detailed instructions for
using this build configuration.
+They will be shown to the users when they set up their builds via TEMPLATECONF.
+"""
+ summary_fixme = """FIXME: Please place here the short summary of what this
build configuration is for.
It will be shown to the users when they set up their builds via TEMPLATECONF.
"""
@@ -41,14 +44,17 @@ It will be shown to the users when they set up their builds
via TEMPLATECONF.
bblayers_data = bblayers_data.replace(abspath,
"##OEROOT##/" + relpath)
dest.write(bblayers_data)
+ with open(os.path.join(destdir, "conf-summary.txt"), 'w') as dest:
+ dest.write(self.summary_fixme)
with open(os.path.join(destdir, "conf-notes.txt"), 'w') as dest:
dest.write(self.notes_fixme)
logger.info("""Configuration template placed into {}
-Please review the files in there, and particularly provide a configuration
description in {}
+Please review the files in there, and particularly provide a configuration
summary in {}
+and notes in {}
You can try out the configuration with
TEMPLATECONF={} . {}/oe-init-build-env build-try-{}"""
-.format(destdir, os.path.join(destdir, "conf-notes.txt"), destdir, oecorepath,
templatename))
+.format(destdir, os.path.join(destdir, "conf-summary.txt"),
os.path.join(destdir, "conf-notes.txt"), destdir, oecorepath, templatename))
def do_save_build_conf(self, args):
""" Save the currently active build configuration (conf/local.conf,
conf/bblayers.conf) as a template into a layer.\n This template can later be
used for setting up builds via TEMPLATECONF. """
diff --git a/meta/lib/oeqa/selftest/cases/bblayers.py
b/meta/lib/oeqa/selftest/cases/bblayers.py
index 2475a79468f..ca1470ced0a 100644
--- a/meta/lib/oeqa/selftest/cases/bblayers.py
+++ b/meta/lib/oeqa/selftest/cases/bblayers.py
@@ -121,7 +121,7 @@ class BitbakeLayers(OESelftestTestCase):
self.assertEqual(bb_vars['BBFILE_PRIORITY_%s' % layername],
str(priority), 'BBFILE_PRIORITY_%s != %d' % (layername, priority))
result = runCmd('bitbake-layers save-build-conf {}
{}'.format(layerpath, "buildconf-1"))
- for f in ('local.conf.sample', 'bblayers.conf.sample',
'conf-notes.txt'):
+ for f in ('local.conf.sample', 'bblayers.conf.sample',
'conf-summary.txt', 'conf-notes.txt'):
fullpath = os.path.join(layerpath, "conf", "templates",
"buildconf-1", f)
self.assertTrue(os.path.exists(fullpath), "Template configuration
file {} not found".format(fullpath))
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#195759):
https://lists.openembedded.org/g/openembedded-core/message/195759
Mute This Topic: https://lists.openembedded.org/mt/104391097/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
