diff options
author | Darren Hart <dvhart@linux.intel.com> | 2011-05-25 12:01:11 -0700 |
---|---|---|
committer | Darren Hart <dvhart@linux.intel.com> | 2011-05-27 09:47:56 -0700 |
commit | e94dba8309874a82a570db60223d18b2c723c3a5 (patch) | |
tree | 8e353e8ca7aee25c2bdb10b63d1fcb0f6842787a | |
parent | b0f4192e67e3140e41870b967977a2440a415c93 (diff) | |
download | meta-intel-e94dba8309874a82a570db60223d18b2c723c3a5.tar.gz |
linux-yocto*: correct FILESEXTRAPATHS assignment in all layers
My previous commit used a self referencing immediate expansion assignment using.
This causes a circular reference and build failure, particularly when more than
one layer is configured in.
Use the _prepend mechanism in conjunction with the immediate expansion
assignment operator to accomplish a similar thing without the self referencing.
Note: This patch is dependent on changes to oe-core, specifically:
http://lists.linuxtogo.org/pipermail/openembedded-core/2011-May/003145.html
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Cc: Tom Zanussi <tom.zanussi@intel.com>
Cc: Phill Blundell <pb@pbcl.net>
Cc: Koen Kooi <koen@dominion.thruhere.net>
11 files changed, 11 insertions, 11 deletions
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto-stable_git.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto-stable_git.bbappend index 44f892fd..570f8d4b 100644 --- a/meta-crownbay/recipes-kernel/linux/linux-yocto-stable_git.bbappend +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto-stable_git.bbappend | |||
@@ -1,4 +1,4 @@ | |||
1 | FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${THISDIR}/${PN}" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | 2 | ||
3 | COMPATIBLE_MACHINE_crownbay = "crownbay" | 3 | COMPATIBLE_MACHINE_crownbay = "crownbay" |
4 | KMACHINE_crownbay = "crownbay" | 4 | KMACHINE_crownbay = "crownbay" |
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_git.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_git.bbappend index 387c2079..cdae0006 100644 --- a/meta-crownbay/recipes-kernel/linux/linux-yocto_git.bbappend +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_git.bbappend | |||
@@ -1,4 +1,4 @@ | |||
1 | FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${THISDIR}/${PN}" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | 2 | ||
3 | COMPATIBLE_MACHINE_crownbay = "crownbay" | 3 | COMPATIBLE_MACHINE_crownbay = "crownbay" |
4 | KMACHINE_crownbay = "yocto/standard/crownbay" | 4 | KMACHINE_crownbay = "yocto/standard/crownbay" |
diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto-stable_git.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto-stable_git.bbappend index 09234dcd..77a665d0 100644 --- a/meta-emenlow/recipes-kernel/linux/linux-yocto-stable_git.bbappend +++ b/meta-emenlow/recipes-kernel/linux/linux-yocto-stable_git.bbappend | |||
@@ -1,3 +1,3 @@ | |||
1 | FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${THISDIR}/${PN}" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | COMPATIBLE_MACHINE_emenlow = "emenlow" | 2 | COMPATIBLE_MACHINE_emenlow = "emenlow" |
3 | KMACHINE_emenlow = "emenlow" | 3 | KMACHINE_emenlow = "emenlow" |
diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto_git.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto_git.bbappend index 3d7e021d..05307b74 100644 --- a/meta-emenlow/recipes-kernel/linux/linux-yocto_git.bbappend +++ b/meta-emenlow/recipes-kernel/linux/linux-yocto_git.bbappend | |||
@@ -1,3 +1,3 @@ | |||
1 | FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${THISDIR}/${PN}" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | COMPATIBLE_MACHINE_emenlow = "emenlow" | 2 | COMPATIBLE_MACHINE_emenlow = "emenlow" |
3 | KMACHINE_emenlow = "yocto/standard/emenlow" | 3 | KMACHINE_emenlow = "yocto/standard/emenlow" |
diff --git a/meta-fishriver/recipes-kernel/linux/linux-yocto-stable_git.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto-stable_git.bbappend index 8003c935..dcc4534b 100644 --- a/meta-fishriver/recipes-kernel/linux/linux-yocto-stable_git.bbappend +++ b/meta-fishriver/recipes-kernel/linux/linux-yocto-stable_git.bbappend | |||
@@ -1,4 +1,4 @@ | |||
1 | FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${THISDIR}/${PN}" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | 2 | ||
3 | COMPATIBLE_MACHINE_fishriver = "crownbay" | 3 | COMPATIBLE_MACHINE_fishriver = "crownbay" |
4 | KMACHINE_fishriver = "crownbay" | 4 | KMACHINE_fishriver = "crownbay" |
diff --git a/meta-fishriver/recipes-kernel/linux/linux-yocto_git.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto_git.bbappend index 2e122219..ba38dbee 100644 --- a/meta-fishriver/recipes-kernel/linux/linux-yocto_git.bbappend +++ b/meta-fishriver/recipes-kernel/linux/linux-yocto_git.bbappend | |||
@@ -1,4 +1,4 @@ | |||
1 | FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${THISDIR}/${PN}" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | COMPATIBLE_MACHINE_fishriver = "fishriver" | 2 | COMPATIBLE_MACHINE_fishriver = "fishriver" |
3 | # zzzz /yocto/standard/crownbay->fishriver | 3 | # zzzz /yocto/standard/crownbay->fishriver |
4 | KMACHINE_fishriver = "yocto/standard/crownbay" | 4 | KMACHINE_fishriver = "yocto/standard/crownbay" |
diff --git a/meta-jasperforest/recipes-kernel/linux/linux-yocto-stable_git.bbappend b/meta-jasperforest/recipes-kernel/linux/linux-yocto-stable_git.bbappend index a6e31d0b..bd6badab 100644 --- a/meta-jasperforest/recipes-kernel/linux/linux-yocto-stable_git.bbappend +++ b/meta-jasperforest/recipes-kernel/linux/linux-yocto-stable_git.bbappend | |||
@@ -1,4 +1,4 @@ | |||
1 | FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${THISDIR}/${PN}" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | 2 | ||
3 | COMPATIBLE_MACHINE_jasperforest = "jasperforest" | 3 | COMPATIBLE_MACHINE_jasperforest = "jasperforest" |
4 | KMACHINE_jasperforest = "jasperforest" | 4 | KMACHINE_jasperforest = "jasperforest" |
diff --git a/meta-jasperforest/recipes-kernel/linux/linux-yocto_git.bbappend b/meta-jasperforest/recipes-kernel/linux/linux-yocto_git.bbappend index 57813268..abceb182 100644 --- a/meta-jasperforest/recipes-kernel/linux/linux-yocto_git.bbappend +++ b/meta-jasperforest/recipes-kernel/linux/linux-yocto_git.bbappend | |||
@@ -1,4 +1,4 @@ | |||
1 | FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${THISDIR}/${PN}" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | 2 | ||
3 | COMPATIBLE_MACHINE_jasperforest = "jasperforest" | 3 | COMPATIBLE_MACHINE_jasperforest = "jasperforest" |
4 | 4 | ||
diff --git a/meta-n450/recipes-kernel/linux/linux-yocto-stable_git.bbappend b/meta-n450/recipes-kernel/linux/linux-yocto-stable_git.bbappend index 73a3ee37..18d4999b 100644 --- a/meta-n450/recipes-kernel/linux/linux-yocto-stable_git.bbappend +++ b/meta-n450/recipes-kernel/linux/linux-yocto-stable_git.bbappend | |||
@@ -1,4 +1,4 @@ | |||
1 | FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${THISDIR}/${PN}" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | KMACHINE_n450 = "atom-pc" | 2 | KMACHINE_n450 = "atom-pc" |
3 | COMPATIBLE_MACHINE_n450 = "n450" | 3 | COMPATIBLE_MACHINE_n450 = "n450" |
4 | 4 | ||
diff --git a/meta-n450/recipes-kernel/linux/linux-yocto_git.bbappend b/meta-n450/recipes-kernel/linux/linux-yocto_git.bbappend index 92d666f1..d52a90aa 100644 --- a/meta-n450/recipes-kernel/linux/linux-yocto_git.bbappend +++ b/meta-n450/recipes-kernel/linux/linux-yocto_git.bbappend | |||
@@ -1,4 +1,4 @@ | |||
1 | FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${THISDIR}/${PN}" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | KMACHINE_n450 = "yocto/standard/common-pc/atom-pc" | 2 | KMACHINE_n450 = "yocto/standard/common-pc/atom-pc" |
3 | COMPATIBLE_MACHINE_n450 = "n450" | 3 | COMPATIBLE_MACHINE_n450 = "n450" |
4 | 4 | ||
diff --git a/meta-sugarbay/recipes-kernel/linux/linux-yocto_git.bbappend b/meta-sugarbay/recipes-kernel/linux/linux-yocto_git.bbappend index c1b9a9ed..72d00ec4 100644 --- a/meta-sugarbay/recipes-kernel/linux/linux-yocto_git.bbappend +++ b/meta-sugarbay/recipes-kernel/linux/linux-yocto_git.bbappend | |||
@@ -1,4 +1,4 @@ | |||
1 | FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${THISDIR}/${PN}" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | 2 | ||
3 | COMPATIBLE_MACHINE_sugarbay = "sugarbay" | 3 | COMPATIBLE_MACHINE_sugarbay = "sugarbay" |
4 | KMACHINE_sugarbay = "yocto/standard/common-pc-64/sugarbay" | 4 | KMACHINE_sugarbay = "yocto/standard/common-pc-64/sugarbay" |