From e94dba8309874a82a570db60223d18b2c723c3a5 Mon Sep 17 00:00:00 2001 From: Darren Hart Date: Wed, 25 May 2011 12:01:11 -0700 Subject: 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 Cc: Tom Zanussi Cc: Phill Blundell Cc: Koen Kooi --- meta-crownbay/recipes-kernel/linux/linux-yocto-stable_git.bbappend | 2 +- meta-crownbay/recipes-kernel/linux/linux-yocto_git.bbappend | 2 +- meta-emenlow/recipes-kernel/linux/linux-yocto-stable_git.bbappend | 2 +- meta-emenlow/recipes-kernel/linux/linux-yocto_git.bbappend | 2 +- meta-fishriver/recipes-kernel/linux/linux-yocto-stable_git.bbappend | 2 +- meta-fishriver/recipes-kernel/linux/linux-yocto_git.bbappend | 2 +- meta-jasperforest/recipes-kernel/linux/linux-yocto-stable_git.bbappend | 2 +- meta-jasperforest/recipes-kernel/linux/linux-yocto_git.bbappend | 2 +- meta-n450/recipes-kernel/linux/linux-yocto-stable_git.bbappend | 2 +- meta-n450/recipes-kernel/linux/linux-yocto_git.bbappend | 2 +- meta-sugarbay/recipes-kernel/linux/linux-yocto_git.bbappend | 2 +- 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 @@ -FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${THISDIR}/${PN}" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" COMPATIBLE_MACHINE_crownbay = "crownbay" 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 @@ -FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${THISDIR}/${PN}" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" COMPATIBLE_MACHINE_crownbay = "crownbay" 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 @@ -FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${THISDIR}/${PN}" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" COMPATIBLE_MACHINE_emenlow = "emenlow" 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 @@ -FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${THISDIR}/${PN}" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" COMPATIBLE_MACHINE_emenlow = "emenlow" 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 @@ -FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${THISDIR}/${PN}" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" COMPATIBLE_MACHINE_fishriver = "crownbay" 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 @@ -FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${THISDIR}/${PN}" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" COMPATIBLE_MACHINE_fishriver = "fishriver" # zzzz /yocto/standard/crownbay->fishriver 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 @@ -FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${THISDIR}/${PN}" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" COMPATIBLE_MACHINE_jasperforest = "jasperforest" 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 @@ -FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${THISDIR}/${PN}" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" COMPATIBLE_MACHINE_jasperforest = "jasperforest" 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 @@ -FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${THISDIR}/${PN}" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" KMACHINE_n450 = "atom-pc" COMPATIBLE_MACHINE_n450 = "n450" 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 @@ -FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${THISDIR}/${PN}" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" KMACHINE_n450 = "yocto/standard/common-pc/atom-pc" COMPATIBLE_MACHINE_n450 = "n450" 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 @@ -FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${THISDIR}/${PN}" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" COMPATIBLE_MACHINE_sugarbay = "sugarbay" KMACHINE_sugarbay = "yocto/standard/common-pc-64/sugarbay" -- cgit v1.2.3-54-g00ecf