MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

bitbake-bblayers/create: Fix layer name generation

Browse Source 
The path to where the layer was being created was taken verbatim as the
name of the layer when generating the layer.conf and README files from
templates. This causes problems in the layer.conf file because it would
result in strangely named variables like

 BBFILE_PATTERN_../my-layer = "..."

Instead of blindly taking the path, use the name of the last component
of the path as the layer name.

Additionally, rework the template files to use python format strings
with named parameters so that the same argument doesn't have to be
repeated multiple times.

[YOCTO #12808]

(From OE-Core rev: 01071c5d524a878d9de4814196cba2f15739796e)

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Joshua Watt 2018-06-28 12:53:41 -05:00 committed by Richard Purdie
parent 1dec2101f9
commit 44b1fe43b0
3 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
meta/lib/bblayers/create.py
View File

@ -30,8 +30,10 @@ class CreatePlugin(LayerPlugin):
conf = os.path.join(layerdir, 'conf')
bb.utils.mkdirhier(conf)
layername = os.path.basename(os.path.normpath(args.layerdir))
# Create the README from templates/README
readme_template = read_template('README') % (args.layerdir, args.layerdir, args.layerdir, args.layerdir, args.layerdir, args.layerdir)
readme_template = read_template('README').format(layername=layername)
readme = os.path.join(layerdir, 'README')
with open(readme, 'w') as fd:
fd.write(readme_template)
@ -47,7 +49,8 @@ class CreatePlugin(LayerPlugin):
compat = self.tinfoil.config_data.getVar('LAYERSERIES_COMPAT_core') or ""
# Create the layer.conf from templates/layer.conf
layerconf_template = read_template('layer.conf') % (args.layerdir, args.layerdir, args.layerdir, args.priority, args.layerdir, args.layerdir, compat)
layerconf_template = read_template('layer.conf').format(
layername=layername, priority=args.priority, compat=compat)
layerconf = os.path.join(conf, 'layer.conf')
with open(layerconf, 'w') as fd:
fd.write(layerconf_template)

12
meta/lib/bblayers/templates/README
View File

@ -1,4 +1,4 @@
This README file contains information on the contents of the %s layer.
This README file contains information on the contents of the {layername} layer.
Please see the corresponding sections below for details.
@ -18,7 +18,7 @@ Dependencies
Patches
=======
Please submit any patches against the %s layer to the xxxx mailing list (xxxx@zzzz.org)
Please submit any patches against the {layername} layer to the xxxx mailing list (xxxx@zzzz.org)
and cc: the maintainer:
Maintainer: XXX YYYYYY <xxx.yyyyyy@zzzzz.com>
@ -26,16 +26,16 @@ Maintainer: XXX YYYYYY <xxx.yyyyyy@zzzzz.com>
Table of Contents
=================
I. Adding the %s layer to your build
I. Adding the {layername} layer to your build
II. Misc
I. Adding the %s layer to your build
I. Adding the {layername} layer to your build
=================================================
Run 'bitbake-layers add-layer %s'
Run 'bitbake-layers add-layer {layername}'
II. Misc
========
--- replace with specific information about the %s layer ---
--- replace with specific information about the {layername} layer ---

16
meta/lib/bblayers/templates/layer.conf
View File

@ -1,13 +1,13 @@
# We have a conf and classes directory, add to BBPATH
BBPATH .= ":${LAYERDIR}"
BBPATH .= ":${{LAYERDIR}}"
# We have recipes-* directories, add to BBFILES
BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
${LAYERDIR}/recipes-*/*/*.bbappend"
BBFILES += "${{LAYERDIR}}/recipes-*/*/*.bb \
${{LAYERDIR}}/recipes-*/*/*.bbappend"
BBFILE_COLLECTIONS += "%s"
BBFILE_PATTERN_%s = "^${LAYERDIR}/"
BBFILE_PRIORITY_%s = "%s"
BBFILE_COLLECTIONS += "{layername}"
BBFILE_PATTERN_{layername} = "^${{LAYERDIR}}/"
BBFILE_PRIORITY_{layername} = "{priority}"
LAYERDEPENDS_%s = "core"
LAYERSERIES_COMPAT_%s = "%s"
LAYERDEPENDS_{layername} = "core"
LAYERSERIES_COMPAT_{layername} = "{compat}"