Patchwork layer.conf: allow other layers to depend on this version

login
register
mail settings
Submitter Paul Eggleton
Date Sept. 25, 2012, 2:58 p.m.
Message ID <1348585112-2458-1-git-send-email-paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/37205/
State Accepted
Commit 7069c7ef829f56ae6dd0dab5e583342f351274ed
Headers show

Comments

Paul Eggleton - Sept. 25, 2012, 2:58 p.m.
Set LAYERVERSION and rename the collection to "core". Given changes such
as the tabs to spaces cleanup for python functions in the current
version, this allows other layers to depend on this version of OE-Core
specifically should they choose to do so, by specifying the following
in their own layer.conf:

LAYERDEPENDS_layername = "core:1"

Where layername is whatever value is being added to BBFILE_COLLECTIONS.

(This change does nothing unless a layer has LAYERDEPENDS set.)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/conf/layer.conf |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
Saul Wold - Sept. 27, 2012, 3:46 p.m.
On 09/25/2012 07:58 AM, Paul Eggleton wrote:
> Set LAYERVERSION and rename the collection to "core". Given changes such
> as the tabs to spaces cleanup for python functions in the current
> version, this allows other layers to depend on this version of OE-Core
> specifically should they choose to do so, by specifying the following
> in their own layer.conf:
>
> LAYERDEPENDS_layername = "core:1"
>
> Where layername is whatever value is being added to BBFILE_COLLECTIONS.
>
> (This change does nothing unless a layer has LAYERDEPENDS set.)
>
> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> ---
>   meta/conf/layer.conf |   10 +++++++---
>   1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
> index ed50f1c..78ceae9 100644
> --- a/meta/conf/layer.conf
> +++ b/meta/conf/layer.conf
> @@ -3,9 +3,13 @@ BBPATH .= ":${LAYERDIR}"
>   # We have a packages directory, add to BBFILES
>   BBFILES += "${LAYERDIR}/recipes-*/*/*.bb"
>
> -BBFILE_COLLECTIONS += "normal"
> -BBFILE_PATTERN_normal := "^${LAYERDIR}/"
> -BBFILE_PRIORITY_normal = "5"
> +BBFILE_COLLECTIONS += "core"
> +BBFILE_PATTERN_core := "^${LAYERDIR}/"
> +BBFILE_PRIORITY_core = "5"
> +
> +# This should only be incremented on significant changes that will
> +# cause compatibility issues with other layers
> +LAYERVERSION_core = "1"
>
>   # Set a variable to get to the top of the metadata location
>   COREBASE := '${@os.path.normpath("${LAYERDIR}/../")}'
>

Merged into OE-Core

Thanks
	Sau!

Patch

diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index ed50f1c..78ceae9 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -3,9 +3,13 @@  BBPATH .= ":${LAYERDIR}"
 # We have a packages directory, add to BBFILES
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb"
 
-BBFILE_COLLECTIONS += "normal"
-BBFILE_PATTERN_normal := "^${LAYERDIR}/"
-BBFILE_PRIORITY_normal = "5"
+BBFILE_COLLECTIONS += "core"
+BBFILE_PATTERN_core := "^${LAYERDIR}/"
+BBFILE_PRIORITY_core = "5"
+
+# This should only be incremented on significant changes that will
+# cause compatibility issues with other layers
+LAYERVERSION_core = "1"
 
 # Set a variable to get to the top of the metadata location
 COREBASE := '${@os.path.normpath("${LAYERDIR}/../")}'