diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2011-06-14 16:47:20 -0400 |
---|---|---|
committer | Darren Hart <dvhart@linux.intel.com> | 2011-06-14 20:05:57 -0700 |
commit | d207c9531effb40d75d4552f589cad60bf8a84e2 (patch) | |
tree | 6561aa43ccb0a5c32b57f69c77a7f6780cf48fc3 /meta-fishriver/recipes-kernel | |
parent | 129773b573a4a2cf1dff2b0f128a8948c069aca8 (diff) | |
download | meta-intel-d207c9531effb40d75d4552f589cad60bf8a84e2.tar.gz |
meta-intel/linux-yocto: update to match the renamed linux-yocto recipes
The linux-yocto recipes have been renamed to include explicit
version numbers. The meta-intel bbappends must be updated to
follow the new naming convention.
As a consequence of the recipe renames any SRCREV specificiations
that were part of a machine.conf have been moved to the corresponding
bbappend file. This allows the 2.6.34 and 2.6.37 SRCREVs to co-exist.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Minor whitespace cleanup.
Remove inadvertant? linux-libc-headers provider change.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Diffstat (limited to 'meta-fishriver/recipes-kernel')
4 files changed, 13 insertions, 8 deletions
diff --git a/meta-fishriver/recipes-kernel/linux/linux-yocto-stable_git.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto-stable_git.bbappend deleted file mode 100644 index 29399ba2..00000000 --- a/meta-fishriver/recipes-kernel/linux/linux-yocto-stable_git.bbappend +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
2 | |||
3 | COMPATIBLE_MACHINE_fishriver = "fishriver" | ||
4 | KMACHINE_fishriver = "fishriver" | ||
5 | |||
diff --git a/meta-fishriver/recipes-kernel/linux/linux-yocto_2.6.34.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto_2.6.34.bbappend new file mode 100644 index 00000000..4084964b --- /dev/null +++ b/meta-fishriver/recipes-kernel/linux/linux-yocto_2.6.34.bbappend | |||
@@ -0,0 +1,7 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
2 | |||
3 | COMPATIBLE_MACHINE_fishriver = "fishriver" | ||
4 | KMACHINE_fishriver = "fishriver" | ||
5 | |||
6 | SRCREV_machine_pn-linux-yocto-stable_fishriver ?= "56fe215d3f1a2cc3a5a26482ac9809ba44495695" | ||
7 | SRCREV_meta_pn-linux-yocto-stable_fishriver ?= "ec26387cb168e9e0976999b528b5a9dd62e3157a" | ||
diff --git a/meta-fishriver/recipes-kernel/linux/linux-yocto_2.6.37.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto_2.6.37.bbappend new file mode 100644 index 00000000..b7671095 --- /dev/null +++ b/meta-fishriver/recipes-kernel/linux/linux-yocto_2.6.37.bbappend | |||
@@ -0,0 +1,6 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
2 | COMPATIBLE_MACHINE_fishriver = "fishriver" | ||
3 | KMACHINE_fishriver = "yocto/standard/fishriver" | ||
4 | |||
5 | SRCREV_machine_pn-linux-yocto_fishriver ?= "697d84759be192403a8a87ab269196c67a0c2c88" | ||
6 | SRCREV_meta_pn-linux-yocto_fishriver ?= "f1dc3722d45cdcc92c84ebfecf4ce616d2efed26" | ||
diff --git a/meta-fishriver/recipes-kernel/linux/linux-yocto_git.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto_git.bbappend deleted file mode 100644 index eec65d8b..00000000 --- a/meta-fishriver/recipes-kernel/linux/linux-yocto_git.bbappend +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
2 | COMPATIBLE_MACHINE_fishriver = "fishriver" | ||
3 | KMACHINE_fishriver = "yocto/standard/fishriver" | ||