meta-intel BBFILE_COLLECTIONS fixups
cover meta-intel BBFILE_COLLECTIONS fixups
From: Tom Zanussi <[email protected]>
This fixes a problem with BBFILE_COLLECTIONS reported by Jeremy Puhlman.
The following changes since commit 1b227f8ed2df529cc13f7169b0c08ff3d0f8c812:
Tom Zanussi (1):
meta-sugarbay: remove xserver-xf86-dri-lite bbappend
are available in the git repository at:
git://git.pokylinux.org/meta-intel.git tzanussi/bbfile-collections-fix
http://git.pokylinux.org/cgit.cgi//log/?h=tzanussi/bbfile-collections-fix
Tom Zanussi (1):
meta-intel: fix BBFILE_COLLECTIONS overrides
meta-crownbay/conf/layer.conf | 4 ++-- meta-fishriver/conf/layer.conf | 2 +- meta-jasperforest/conf/layer.conf | 2 +- meta-sugarbay/conf/layer.conf | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
PATCH 1/1 meta-intel: fix BBFILE_COLLECTIONS overrides
From: Tom Zanussi <[email protected]>
Several BBFILE_COLLECTIONS assignments in the layer.confs for these meta-intel layers added unwanted machine overrides, resulting in truncated values for this variable - remove them.
--- meta-crownbay/conf/layer.conf | 4 ++-- meta-fishriver/conf/layer.conf | 2 +- meta-jasperforest/conf/layer.conf | 2 +- meta-sugarbay/conf/layer.conf | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
meta-crownbay/conf/layer.conf +2 -2
@@ -5,10 +5,10 @@ BBPATH := "${BBPATH}:${LAYERDIR}" BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" -BBFILE_COLLECTIONS_crownbay += "crownbay" +BBFILE_COLLECTIONS_append_crownbay += "crownbay" BBFILE_PATTERN_crownbay := "^${LAYERDIR}/" BBFILE_PRIORITY_crownbay = "6" -BBFILE_COLLECTIONS_crownbay-noemgd += "crownbay-noemgd" +BBFILE_COLLECTIONS_append_crownbay-noemgd += "crownbay-noemgd" BBFILE_PATTERN_crownbay-noemgd := "^${LAYERDIR}/" BBFILE_PRIORITY_crownbay-noemgd = "6"
meta-fishriver/conf/layer.conf +1 -1
@@ -5,6 +5,6 @@ BBPATH := "${BBPATH}:${LAYERDIR}" BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" -BBFILE_COLLECTIONS_fishriver += "fishriver" +BBFILE_COLLECTIONS += "fishriver" BBFILE_PATTERN_fishriver := "^${LAYERDIR}/" BBFILE_PRIORITY_fishriver = "6"
meta-jasperforest/conf/layer.conf +1 -1
@@ -7,6 +7,6 @@ BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/../common/recipes-*/*/*.bb \ ${LAYERDIR}/../common/recipes-*/*/*.bbappend" -BBFILE_COLLECTIONS_jasperforest += "jasperforest" +BBFILE_COLLECTIONS += "jasperforest" BBFILE_PATTERN_jasperforest := "^${LAYERDIR}/" BBFILE_PRIORITY_jasperforest = "6"
meta-sugarbay/conf/layer.conf +1 -1
@@ -7,6 +7,6 @@ BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/../common/recipes-*/*/*.bb \ ${LAYERDIR}/../common/recipes-*/*/*.bbappend" -BBFILE_COLLECTIONS_sugarbay += "sugarbay" +BBFILE_COLLECTIONS += "sugarbay" BBFILE_PATTERN_sugarbay := "^${LAYERDIR}/" BBFILE_PRIORITY_sugarbay = "6"
Signature · 1 line
1.7.0.4
Re: [PATCH 1/1] meta-intel: fix BBFILE_COLLECTIONS overrides
Quoted 5 lines · On 05/26/2011 08:40 AM, [email protected] wrote:
From: Tom Zanussi <[email protected]>
Several
BBFILE_COLLECTIONSassignments in the layer.confs for these meta-intel layers added unwanted machine overrides, resulting in truncated values for this variable - remove them.
Why the difference between crownbay and the other BSPs? Crownbay uses _append.
--
Darren
Quoted 62 lines
Signed-off-by Tom Zanussi <[email protected]>--- meta-crownbay/conf/layer.conf | 4 ++-- meta-fishriver/conf/layer.conf | 2 +- meta-jasperforest/conf/layer.conf | 2 +- meta-sugarbay/conf/layer.conf | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)meta-crownbay/conf/layer.conf +2
-2@@ -5,10 +5,10 @@ BBPATH := "${BBPATH}:${LAYERDIR}" BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" -BBFILE_COLLECTIONS_crownbay += "crownbay" +BBFILE_COLLECTIONS_append_crownbay += "crownbay" BBFILE_PATTERN_crownbay := "^${LAYERDIR}/" BBFILE_PRIORITY_crownbay = "6" -BBFILE_COLLECTIONS_crownbay-noemgd += "crownbay-noemgd" +BBFILE_COLLECTIONS_append_crownbay-noemgd += "crownbay-noemgd" BBFILE_PATTERN_crownbay-noemgd := "^${LAYERDIR}/" BBFILE_PRIORITY_crownbay-noemgd = "6"meta-fishriver/conf/layer.conf +1
-1@@ -5,6 +5,6 @@ BBPATH := "${BBPATH}:${LAYERDIR}" BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" -BBFILE_COLLECTIONS_fishriver += "fishriver" +BBFILE_COLLECTIONS += "fishriver" BBFILE_PATTERN_fishriver := "^${LAYERDIR}/" BBFILE_PRIORITY_fishriver = "6"meta-jasperforest/conf/layer.conf +1
-1@@ -7,6 +7,6 @@ BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/../common/recipes-*/*/*.bb \ ${LAYERDIR}/../common/recipes-*/*/*.bbappend" -BBFILE_COLLECTIONS_jasperforest += "jasperforest" +BBFILE_COLLECTIONS += "jasperforest" BBFILE_PATTERN_jasperforest := "^${LAYERDIR}/" BBFILE_PRIORITY_jasperforest = "6"meta-sugarbay/conf/layer.conf +1
-1@@ -7,6 +7,6 @@ BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/../common/recipes-*/*/*.bb \ ${LAYERDIR}/../common/recipes-*/*/*.bbappend" -BBFILE_COLLECTIONS_sugarbay += "sugarbay" +BBFILE_COLLECTIONS += "sugarbay" BBFILE_PATTERN_sugarbay := "^${LAYERDIR}/" BBFILE_PRIORITY_sugarbay = "6"
Signature · 3 lines
Darren Hart Intel Open Source Technology Center Yocto Project - Linux Kernel
Re: [PATCH 1/1] meta-intel: fix BBFILE_COLLECTIONS overrides
Quoted 11 lines · Darren Hart
Quoted 5 lines · On 05/26/2011 08:40 AM, [email protected] wrote:
From: Tom Zanussi <[email protected]>
Several
BBFILE_COLLECTIONSassignments in the layer.confs for these meta-intel layers added unwanted machine overrides, resulting in truncated values for this variable - remove them.Why the difference between crownbay and the other BSPs? Crownbay uses
_append.
The crownbay has two BBFILE_COLLECTIONS in the same file, one for crownbay and one for crownbay-noemgd. The conditional append allows them to be selected based on the machine selected.
Tom
Quoted 66 lines
--
DarrenQuoted 62 lines
Signed-off-by Tom Zanussi <[email protected]>--- meta-crownbay/conf/layer.conf | 4 ++-- meta-fishriver/conf/layer.conf | 2 +- meta-jasperforest/conf/layer.conf | 2 +- meta-sugarbay/conf/layer.conf | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)meta-crownbay/conf/layer.conf +2
-2@@ -5,10 +5,10 @@ BBPATH := "${BBPATH}:${LAYERDIR}" BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" -BBFILE_COLLECTIONS_crownbay += "crownbay" +BBFILE_COLLECTIONS_append_crownbay += "crownbay" BBFILE_PATTERN_crownbay := "^${LAYERDIR}/" BBFILE_PRIORITY_crownbay = "6" -BBFILE_COLLECTIONS_crownbay-noemgd += "crownbay-noemgd" +BBFILE_COLLECTIONS_append_crownbay-noemgd += "crownbay-noemgd" BBFILE_PATTERN_crownbay-noemgd := "^${LAYERDIR}/" BBFILE_PRIORITY_crownbay-noemgd = "6"meta-fishriver/conf/layer.conf +1
-1@@ -5,6 +5,6 @@ BBPATH := "${BBPATH}:${LAYERDIR}" BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" -BBFILE_COLLECTIONS_fishriver += "fishriver" +BBFILE_COLLECTIONS += "fishriver" BBFILE_PATTERN_fishriver := "^${LAYERDIR}/" BBFILE_PRIORITY_fishriver = "6"meta-jasperforest/conf/layer.conf +1
-1@@ -7,6 +7,6 @@ BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/../common/recipes-*/*/*.bb \ ${LAYERDIR}/../common/recipes-*/*/*.bbappend" -BBFILE_COLLECTIONS_jasperforest += "jasperforest" +BBFILE_COLLECTIONS += "jasperforest" BBFILE_PATTERN_jasperforest := "^${LAYERDIR}/" BBFILE_PRIORITY_jasperforest = "6"meta-sugarbay/conf/layer.conf +1
-1@@ -7,6 +7,6 @@ BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/../common/recipes-*/*/*.bb \ ${LAYERDIR}/../common/recipes-*/*/*.bbappend" -BBFILE_COLLECTIONS_sugarbay += "sugarbay" +BBFILE_COLLECTIONS += "sugarbay" BBFILE_PATTERN_sugarbay := "^${LAYERDIR}/" BBFILE_PRIORITY_sugarbay = "6"
Re: [PATCH 1/1] meta-intel: fix BBFILE_COLLECTIONS overrides
Quoted 4 lines
The crownbay has two
BBFILE_COLLECTIONSin the same file, one for crownbay and one for crownbay-noemgd. The conditional append allows them to be selected based on the machine selected.
The BBFILE_COLLECTIONS var basically give you a hook so you can find:
BBFILE_PATTERN_<value set in BBFILE_COLLECTIONS>
BBFILE_PRIORITY_<value set in BBFILE_COLLECTIONS>
While it certainly is true you could have different sets, for different machines, you set those subsequent values identically. At the moment there appears to be no need unless your using the value in some other manner else where. FWIW it probably doesn't matter either way, but it doesn't appear to be needed by the way you are configuring it.
Jeremy Puhlman
Montavista Sofware, LLC.
Re: [PATCH 1/1] meta-intel: fix BBFILE_COLLECTIONS overrides
Quoted 10 lines · Jeremy Puhlman
Quoted 3 lines
The crownbay has two
BBFILE_COLLECTIONSin the same file, one for crownbay and one for crownbay-noemgd. The conditional append allows them to be selected based on the machine selected.The
BBFILE_COLLECTIONSvar basically give you a hook so you can find:BBFILE_PATTERN_<value set in
BBFILE_COLLECTIONS>
BBFILE_PRIORITY_<value set inBBFILE_COLLECTIONS>
Quoted 6 lines
While it certainly is true you could have different sets, for different machines, you set those subsequent values identically. At the moment there appears to be no need unless your using the value in some other manner else where. FWIW it probably doesn't matter either way, but it doesn't appear to be needed by the way you are configuring it.
Yeah, you're right - it probably isn't necessary, though not broken either.
Another thing to put on my list of cleanups for meta-intel that I never seem to get to...
Thanks for your comments,
Tom
Quoted 3 lines
Jeremy Puhlman
Montavista Sofware, LLC.