diff options
author | Darren Hart <dvhart@linux.intel.com> | 2011-05-12 15:37:09 -0700 |
---|---|---|
committer | Darren Hart <dvhart@linux.intel.com> | 2011-05-13 07:47:47 -0700 |
commit | 90ace178d3fb5d253cdba396bce66dd2fce2ed79 (patch) | |
tree | ccdb76a22424cac6c2797f38c8e5b3af66694f9a | |
parent | 5790768e770e5a86bab2f77bb399b17d60404a42 (diff) | |
download | meta-intel-90ace178d3fb5d253cdba396bce66dd2fce2ed79.tar.gz |
linux-yocto*: extend FILESEXTRAPATHS instead of clobber them
Clobbering FILESEXTRAPATHS prevents multiple bbappend files providing file://
SRC_URIs. Extend the variable in each meta-* layer instead.
Build tested with linux-yocto on n450 and crownbay and linux-yocto-stable on
crownbay. Build tested linux-yocto on n450 with a third layer adding a config
fragment.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Acked-by: Tom Zanussi <tom.zanussi@intel.com>
10 files changed, 10 insertions, 10 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 4136536f..83094789 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 := "${THISDIR}/${PN}" | 1 | FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${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 32bbd107..5912fb7c 100644 --- a/meta-crownbay/recipes-kernel/linux/linux-yocto_git.bbappend +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_git.bbappend | |||
@@ -1,3 +1,3 @@ | |||
1 | FILESEXTRAPATHS := "${THISDIR}/${PN}" | 1 | FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${THISDIR}/${PN}" |
2 | COMPATIBLE_MACHINE_crownbay = "crownbay" | 2 | COMPATIBLE_MACHINE_crownbay = "crownbay" |
3 | KMACHINE_crownbay = "yocto/standard/crownbay" | 3 | 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 9fa2937d..09234dcd 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 := "${THISDIR}/${PN}" | 1 | FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${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 360c2596..3d7e021d 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 := "${THISDIR}/${PN}" | 1 | FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${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_git.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto_git.bbappend index 549d0857..2e122219 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 := "${THISDIR}/${PN}" | 1 | FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${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 066776b3..a6e31d0b 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 := "${THISDIR}/${PN}" | 1 | FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${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 988c9694..57813268 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 := "${THISDIR}/${PN}" | 1 | FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${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 e69c644b..73a3ee37 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 := "${THISDIR}/${PN}" | 1 | FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${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 79706d54..92d666f1 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 := "${THISDIR}/${PN}" | 1 | FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${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 fe160c06..c1b9a9ed 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 := "${THISDIR}/${PN}" | 1 | FILESEXTRAPATHS := "${FILESEXTRAPATHS}:${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" |