diff options
Diffstat (limited to 'poky/meta/lib/bblayers')
| -rw-r--r-- | poky/meta/lib/bblayers/create.py | 10 | ||||
| -rw-r--r-- | poky/meta/lib/bblayers/templates/README | 12 | ||||
| -rw-r--r-- | poky/meta/lib/bblayers/templates/layer.conf | 15 |
3 files changed, 23 insertions, 14 deletions
diff --git a/poky/meta/lib/bblayers/create.py b/poky/meta/lib/bblayers/create.py index c1923166f..2ebf151ad 100644 --- a/poky/meta/lib/bblayers/create.py +++ b/poky/meta/lib/bblayers/create.py @@ -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) @@ -43,8 +45,12 @@ class CreatePlugin(LayerPlugin): license_dst = os.path.join(layerdir, copying) shutil.copy(license_src, license_dst) + # Get the compat value for core layer. + 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) + 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) diff --git a/poky/meta/lib/bblayers/templates/README b/poky/meta/lib/bblayers/templates/README index 5a77f8d34..fb2d28e17 100644 --- a/poky/meta/lib/bblayers/templates/README +++ b/poky/meta/lib/bblayers/templates/README @@ -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 --- diff --git a/poky/meta/lib/bblayers/templates/layer.conf b/poky/meta/lib/bblayers/templates/layer.conf index 3c0300226..e2eaff434 100644 --- a/poky/meta/lib/bblayers/templates/layer.conf +++ b/poky/meta/lib/bblayers/templates/layer.conf @@ -1,10 +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_{layername} = "core" +LAYERSERIES_COMPAT_{layername} = "{compat}" |