Skip to contentSkip to conversation

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

PATCH Applied Paul Eggleton 2 participants 2 messages Sep 25, 2012 – Sep 27, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 layer.conf: allow other layers to depend on this version

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.)

---
 meta/conf/layer.conf |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
meta/conf/layer.conf +7 -3
index ed50f1c..78ceae9 100644
@@ -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}/../")}'
Signature · 1 line
1.7.9.5
Applied
#1 lore raw
Quoted 29 lines · Paul Eggleton

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.)

---
  meta/conf/layer.conf |   10 +++++++---
  1 file changed, 7 insertions(+), 3 deletions(-)
meta/conf/layer.conf +0 -3
index ed50f1c..78ceae9 100644
@@ -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"

meta/conf/layer.conf BBPATH .= ":${LAYERDIR}" · line 15

Quoted 10 lines
meta/conf/layer.conf +7 -0
+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!