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

bitbake-layers/create: add LAYERSERIES_COMPAT

Browse Source 
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>
This commit is contained in:
Anuj Mittal 2018-06-11 16:29:01 +08:00 committed by Richard Purdie
parent 4699d29ac2
commit ffeb85ab80
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,8 +43,11 @@ class CreatePlugin(LayerPlugin):
license_dst = os.path.join(layerdir, copying) license_dst = os.path.join(layerdir, copying)
shutil.copy(license_src, license_dst) 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 # 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') layerconf = os.path.join(conf, 'layer.conf')
with open(layerconf, 'w') as fd: with open(layerconf, 'w') as fd:
fd.write(layerconf_template) fd.write(layerconf_template)

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

@ -8,3 +8,6 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
BBFILE_COLLECTIONS += "%s" BBFILE_COLLECTIONS += "%s"
BBFILE_PATTERN_%s = "^${LAYERDIR}/" BBFILE_PATTERN_%s = "^${LAYERDIR}/"
BBFILE_PRIORITY_%s = "%s" BBFILE_PRIORITY_%s = "%s"
LAYERDEPENDS_%s = "core"
LAYERSERIES_COMPAT_%s = "%s"