All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] layers: consolidate layer priority to match oe-core
@ 2020-12-10 14:19 Ross Burton
  2020-12-11 17:34 ` [meta-arm] " Jon Mason
  0 siblings, 1 reply; 2+ messages in thread
From: Ross Burton @ 2020-12-10 14:19 UTC (permalink / raw)
  To: meta-arm

Without exceptional justification there is no good reason for layers to
have a priority other than 5, to match oe-core.  If a layer has a
priority higher than oe-core's then recipes in that layer take immediate
preference over those in oe-core and there's no simple way to resolve
this as that is exactly what is meant to happen.

As a concrete example, meta-arm-bsp contains older releases of U-Boot
for platforms that have not yet moved to the latest release in oe-core.
As the priority of meta-arm-bsp is higher, simply adding this layer to a
qemuarm build will immediately downgrade u-boot.

As there is no exceptional justification for the differing priorities,
unify on 5.

Change-Id: I1975753b4a9799cc00310a7c8a6a11c2aef41f65
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-arm-autonomy/conf/layer.conf  | 2 +-
 meta-arm-bsp/conf/layer.conf       | 2 +-
 meta-arm-toolchain/conf/layer.conf | 2 +-
 meta-gem5/conf/layer.conf          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta-arm-autonomy/conf/layer.conf b/meta-arm-autonomy/conf/layer.conf
index 936b6c1..dee0c01 100644
--- a/meta-arm-autonomy/conf/layer.conf
+++ b/meta-arm-autonomy/conf/layer.conf
@@ -9,7 +9,7 @@ BBFILES += " \
 
 BBFILE_COLLECTIONS += "meta-arm-autonomy"
 BBFILE_PATTERN_meta-arm-autonomy = "^${LAYERDIR}/"
-BBFILE_PRIORITY_meta-arm-autonomy = "6"
+BBFILE_PRIORITY_meta-arm-autonomy = "5"
 LAYERDEPENDS_meta-arm-autonomy = " \
    core \
    yocto \
diff --git a/meta-arm-bsp/conf/layer.conf b/meta-arm-bsp/conf/layer.conf
index 8374012..445697f 100644
--- a/meta-arm-bsp/conf/layer.conf
+++ b/meta-arm-bsp/conf/layer.conf
@@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "meta-arm-bsp"
 BBFILE_PATTERN_meta-arm-bsp = "^${LAYERDIR}/"
-BBFILE_PRIORITY_meta-arm-bsp = "6"
+BBFILE_PRIORITY_meta-arm-bsp = "5"
 
 LAYERSERIES_COMPAT_meta-arm-bsp = "gatesgarth"
 
diff --git a/meta-arm-toolchain/conf/layer.conf b/meta-arm-toolchain/conf/layer.conf
index d0ca75a..1a0499d 100644
--- a/meta-arm-toolchain/conf/layer.conf
+++ b/meta-arm-toolchain/conf/layer.conf
@@ -6,7 +6,7 @@ BBFILES += "\
 
 BBFILE_COLLECTIONS += "arm-toolchain"
 BBFILE_PATTERN_arm-toolchain := "^${LAYERDIR}/"
-BBFILE_PRIORITY_arm-toolchain = "30"
+BBFILE_PRIORITY_arm-toolchain = "5"
 
 # Additional license directories.
 LICENSE_PATH += "${LAYERDIR}/custom-licenses"
diff --git a/meta-gem5/conf/layer.conf b/meta-gem5/conf/layer.conf
index 58242c3..a6448eb 100644
--- a/meta-gem5/conf/layer.conf
+++ b/meta-gem5/conf/layer.conf
@@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "meta-gem5"
 BBFILE_PATTERN_meta-gem5 = "^${LAYERDIR}/"
-BBFILE_PRIORITY_meta-gem5 = "6"
+BBFILE_PRIORITY_meta-gem5 = "5"
 
 LAYERDEPENDS_meta-gem5 = "core openembedded-layer"
 LAYERSERIES_COMPAT_meta-gem5 = "gatesgarth"
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread
* Re: [meta-arm] [PATCH] layers: consolidate layer priority to match oe-core
  2020-12-10 14:19 [PATCH] layers: consolidate layer priority to match oe-core Ross Burton
@ 2020-12-11 17:34 ` Jon Mason
  0 siblings, 0 replies; 2+ messages in thread
From: Jon Mason @ 2020-12-11 17:34 UTC (permalink / raw)
  To: Ross Burton; +Cc: meta-arm

On Thu, Dec 10, 2020 at 02:19:15PM +0000, Ross Burton wrote:
> Without exceptional justification there is no good reason for layers to
> have a priority other than 5, to match oe-core.  If a layer has a
> priority higher than oe-core's then recipes in that layer take immediate
> preference over those in oe-core and there's no simple way to resolve
> this as that is exactly what is meant to happen.
> 
> As a concrete example, meta-arm-bsp contains older releases of U-Boot
> for platforms that have not yet moved to the latest release in oe-core.
> As the priority of meta-arm-bsp is higher, simply adding this layer to a
> qemuarm build will immediately downgrade u-boot.
> 
> As there is no exceptional justification for the differing priorities,
> unify on 5.
> 
> Change-Id: I1975753b4a9799cc00310a7c8a6a11c2aef41f65
> Signed-off-by: Ross Burton <ross.burton@arm.com>

Applied to master

Thanks,
Jon

> ---
>  meta-arm-autonomy/conf/layer.conf  | 2 +-
>  meta-arm-bsp/conf/layer.conf       | 2 +-
>  meta-arm-toolchain/conf/layer.conf | 2 +-
>  meta-gem5/conf/layer.conf          | 2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/meta-arm-autonomy/conf/layer.conf b/meta-arm-autonomy/conf/layer.conf
> index 936b6c1..dee0c01 100644
> --- a/meta-arm-autonomy/conf/layer.conf
> +++ b/meta-arm-autonomy/conf/layer.conf
> @@ -9,7 +9,7 @@ BBFILES += " \
>  
>  BBFILE_COLLECTIONS += "meta-arm-autonomy"
>  BBFILE_PATTERN_meta-arm-autonomy = "^${LAYERDIR}/"
> -BBFILE_PRIORITY_meta-arm-autonomy = "6"
> +BBFILE_PRIORITY_meta-arm-autonomy = "5"
>  LAYERDEPENDS_meta-arm-autonomy = " \
>     core \
>     yocto \
> diff --git a/meta-arm-bsp/conf/layer.conf b/meta-arm-bsp/conf/layer.conf
> index 8374012..445697f 100644
> --- a/meta-arm-bsp/conf/layer.conf
> +++ b/meta-arm-bsp/conf/layer.conf
> @@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
>  
>  BBFILE_COLLECTIONS += "meta-arm-bsp"
>  BBFILE_PATTERN_meta-arm-bsp = "^${LAYERDIR}/"
> -BBFILE_PRIORITY_meta-arm-bsp = "6"
> +BBFILE_PRIORITY_meta-arm-bsp = "5"
>  
>  LAYERSERIES_COMPAT_meta-arm-bsp = "gatesgarth"
>  
> diff --git a/meta-arm-toolchain/conf/layer.conf b/meta-arm-toolchain/conf/layer.conf
> index d0ca75a..1a0499d 100644
> --- a/meta-arm-toolchain/conf/layer.conf
> +++ b/meta-arm-toolchain/conf/layer.conf
> @@ -6,7 +6,7 @@ BBFILES += "\
>  
>  BBFILE_COLLECTIONS += "arm-toolchain"
>  BBFILE_PATTERN_arm-toolchain := "^${LAYERDIR}/"
> -BBFILE_PRIORITY_arm-toolchain = "30"
> +BBFILE_PRIORITY_arm-toolchain = "5"
>  
>  # Additional license directories.
>  LICENSE_PATH += "${LAYERDIR}/custom-licenses"
> diff --git a/meta-gem5/conf/layer.conf b/meta-gem5/conf/layer.conf
> index 58242c3..a6448eb 100644
> --- a/meta-gem5/conf/layer.conf
> +++ b/meta-gem5/conf/layer.conf
> @@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
>  
>  BBFILE_COLLECTIONS += "meta-gem5"
>  BBFILE_PATTERN_meta-gem5 = "^${LAYERDIR}/"
> -BBFILE_PRIORITY_meta-gem5 = "6"
> +BBFILE_PRIORITY_meta-gem5 = "5"
>  
>  LAYERDEPENDS_meta-gem5 = "core openembedded-layer"
>  LAYERSERIES_COMPAT_meta-gem5 = "gatesgarth"
> -- 
> 2.25.1
> 

> 
> 
> 


^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-12-11 17:34 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-10 14:19 [PATCH] layers: consolidate layer priority to match oe-core Ross Burton
2020-12-11 17:34 ` [meta-arm] " Jon Mason

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.