diff options
| author |   Anuj Mittal <anuj.mittal@intel.com> | 2018-06-11 16:29:01 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-06-18 10:59:33 +0100 |
| commit | 461c305078c40fca8b5382e393e3e8513d4abfa4 (patch) | |
| tree | 8938a1ec791226840b88447d31c9adc3e706d765 | |
| parent | a335e78672b1e1ae3ea6427f6a805218e513bb52 (diff) | |
| download | openembedded-core-461c305078c40fca8b5382e393e3e8513d4abfa4.tar.gz | |
bitbake-layers/create: add LAYERSERIES_COMPAT
Derive the value for template layer.conf from core layer and add
dependendency on it too.
Fixes [YOCTO #12767]
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/lib/bblayers/create.py | 5 | ||||
| -rw-r--r-- | meta/lib/bblayers/templates/layer.conf | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/meta/lib/bblayers/create.py b/meta/lib/bblayers/create.py index c1923166fd..e06949c92b 100644 --- a/meta/lib/bblayers/create.py +++ b/meta/lib/bblayers/create.py @@ -43,8 +43,11 @@ 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') % (args.layerdir, args.layerdir, args.layerdir, args.priority, args.layerdir, args.layerdir, compat) layerconf = os.path.join(conf, 'layer.conf') with open(layerconf, 'w') as fd: fd.write(layerconf_template) diff --git a/meta/lib/bblayers/templates/layer.conf b/meta/lib/bblayers/templates/layer.conf index 3c0300226c..49f95cafc8 100644 --- a/meta/lib/bblayers/templates/layer.conf +++ b/meta/lib/bblayers/templates/layer.conf @@ -8,3 +8,6 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "%s" BBFILE_PATTERN_%s = "^${LAYERDIR}/" BBFILE_PRIORITY_%s = "%s" + +LAYERDEPENDS_%s = "core" +LAYERSERIES_COMPAT_%s = "%s" |