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 11:07:58 +0100 |
commit | ffeb85ab80fb2f15d31675a0e6deddb1bab4760e (patch) | |
tree | fb22eba9127e8d4cfbea7291eca6ea291eb8082b /meta/lib | |
parent | 4699d29ac2a1a8607970638df9cf6478b1c02331 (diff) | |
download | poky-ffeb85ab80fb2f15d31675a0e6deddb1bab4760e.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]
(From OE-Core rev: 461c305078c40fca8b5382e393e3e8513d4abfa4)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-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): | |||
43 | license_dst = os.path.join(layerdir, copying) | 43 | license_dst = os.path.join(layerdir, copying) |
44 | shutil.copy(license_src, license_dst) | 44 | shutil.copy(license_src, license_dst) |
45 | 45 | ||
46 | # Get the compat value for core layer. | ||
47 | compat = self.tinfoil.config_data.getVar('LAYERSERIES_COMPAT_core') or "" | ||
48 | |||
46 | # Create the layer.conf from templates/layer.conf | 49 | # Create the layer.conf from templates/layer.conf |
47 | layerconf_template = read_template('layer.conf') % (args.layerdir, args.layerdir, args.layerdir, args.priority) | 50 | layerconf_template = read_template('layer.conf') % (args.layerdir, args.layerdir, args.layerdir, args.priority, args.layerdir, args.layerdir, compat) |
48 | layerconf = os.path.join(conf, 'layer.conf') | 51 | layerconf = os.path.join(conf, 'layer.conf') |
49 | with open(layerconf, 'w') as fd: | 52 | with open(layerconf, 'w') as fd: |
50 | fd.write(layerconf_template) | 53 | 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 \ | |||
8 | BBFILE_COLLECTIONS += "%s" | 8 | BBFILE_COLLECTIONS += "%s" |
9 | BBFILE_PATTERN_%s = "^${LAYERDIR}/" | 9 | BBFILE_PATTERN_%s = "^${LAYERDIR}/" |
10 | BBFILE_PRIORITY_%s = "%s" | 10 | BBFILE_PRIORITY_%s = "%s" |
11 | |||
12 | LAYERDEPENDS_%s = "core" | ||
13 | LAYERSERIES_COMPAT_%s = "%s" | ||