Patchwork [RFC] layer.conf: allow BBFILE_PRIORITY to be overriden

login
mail settings
Submitter Johan Hovold
Date Dec. 18, 2012, 6:16 p.m.
Message ID <1355854583-6229-1-git-send-email-johan.hovold@lundinova.se>
Download mbox | patch
Permalink /patch/41299/
State New
Headers show

Comments

Johan Hovold - Dec. 18, 2012, 6:16 p.m.
Use weak assignment for BBFILE_PRIORITY so that it can be overriden
locally in bblayers.conf.

Signed-off-by: Johan Hovold <johan.hovold@lundinova.se>
---

Hi, 

This would allow the layer priorities to be altered locally while still letting
upstream define default priorities for the layers.

In my setup I try to use oe-core over meta-oe whenever possible, but the
default priorities are inversed. Simply pinning the version is not an option
when the same version exists in more than one layer (e.g. udev-182).

Would this be an acceptable way of adding local layer-priority control? Is
there any other way?

Thanks,
Johan

 meta-hob/conf/layer.conf      | 2 +-
 meta-skeleton/conf/layer.conf | 2 +-
 meta/conf/layer.conf          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Patch

diff --git a/meta-hob/conf/layer.conf b/meta-hob/conf/layer.conf
index 5f5eb82..ff43271 100644
--- a/meta-hob/conf/layer.conf
+++ b/meta-hob/conf/layer.conf
@@ -6,4 +6,4 @@  BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb"
 
 BBFILE_COLLECTIONS += "hob"
 BBFILE_PATTERN_hob := "^${LAYERDIR}/"
-BBFILE_PRIORITY_hob = "1"
+BBFILE_PRIORITY_hob ?= "1"
diff --git a/meta-skeleton/conf/layer.conf b/meta-skeleton/conf/layer.conf
index edb31dd..977fb75 100644
--- a/meta-skeleton/conf/layer.conf
+++ b/meta-skeleton/conf/layer.conf
@@ -6,5 +6,5 @@  BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb"
 
 BBFILE_COLLECTIONS += "skeleton"
 BBFILE_PATTERN_skeleton := "^${LAYERDIR}/"
-BBFILE_PRIORITY_skeleton = "1"
+BBFILE_PRIORITY_skeleton ?= "1"
 
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index 78ceae9..d5b3f94 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -5,7 +5,7 @@  BBFILES += "${LAYERDIR}/recipes-*/*/*.bb"
 
 BBFILE_COLLECTIONS += "core"
 BBFILE_PATTERN_core := "^${LAYERDIR}/"
-BBFILE_PRIORITY_core = "5"
+BBFILE_PRIORITY_core ?= "5"
 
 # This should only be incremented on significant changes that will
 # cause compatibility issues with other layers