On Mon, 2018-06-11 at 09:52 +0800, Anuj Mittal wrote:
> 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.mit...@intel.com>
> ---
> meta/lib/bblayers/create.py | 2 +-
> meta/lib/bblayers/templates/layer.conf | 3 +++
> 2 files changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/meta/lib/bblayers/create.py
> b/meta/lib/bblayers/create.py
> index c1923166fd..d9699b21f9 100644
> --- a/meta/lib/bblayers/create.py
> +++ b/meta/lib/bblayers/create.py
> @@ -44,7 +44,7 @@ class CreatePlugin(LayerPlugin):
> shutil.copy(license_src, license_dst)
>
> # 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)
> 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..61b3ad8db3 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 = "${LAYERSERIES_COMPAT_core}"
I feel very strongly that we do not want to just copy and paste this
"follow core" value around. The template needs to contain an expanded
value so that when core changes, people need to update their layer to
say what they're compatible with.
Cheers,
Richard
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
