layers: consolidate layer priority to match oe-core
PATCH 1/1 layers: consolidate layer priority to match oe-core
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.
--- 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(-)
meta-arm-autonomy/conf/layer.conf +1 -1
@@ -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 \
meta-arm-bsp/conf/layer.conf +1 -1
@@ -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"
meta-arm-toolchain/conf/layer.conf +1 -1
@@ -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"
meta-gem5/conf/layer.conf +1 -1
@@ -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"
Signature · 1 line
2.25.1
Jon Mason
AppliedQuoted 11 lines · Ross Burton
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.
Quoted 5 lines
As there is no exceptional justification for the differing priorities, unify on 5.
Change-Id I1975753b4a9799cc00310a7c8a6a11c2aef41f65Signed-off-by Ross Burton <[email protected]>
Applied to master
Thanks,
Jon
Quoted 66 lines
--- 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(-)meta-arm-autonomy/conf/layer.conf +1
-1@@ -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 \meta-arm-bsp/conf/layer.conf +1
-1@@ -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"meta-arm-toolchain/conf/layer.conf +1
-1@@ -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"meta-gem5/conf/layer.conf +1
-1@@ -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"Signature · 1 line
2.25.1