summaryrefslogtreecommitdiffstats
path: root/meta-fishriver
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2011-06-14 20:47:20 (GMT)
committerDarren Hart <dvhart@linux.intel.com>2011-06-15 03:05:57 (GMT)
commitd207c9531effb40d75d4552f589cad60bf8a84e2 (patch)
tree6561aa43ccb0a5c32b57f69c77a7f6780cf48fc3 /meta-fishriver
parent129773b573a4a2cf1dff2b0f128a8948c069aca8 (diff)
downloadmeta-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')
-rw-r--r--meta-fishriver/conf/machine/fishriver.conf6
-rw-r--r--meta-fishriver/recipes-kernel/linux/linux-yocto-stable_git.bbappend5
-rw-r--r--meta-fishriver/recipes-kernel/linux/linux-yocto_2.6.34.bbappend7
-rw-r--r--meta-fishriver/recipes-kernel/linux/linux-yocto_2.6.37.bbappend6
-rw-r--r--meta-fishriver/recipes-kernel/linux/linux-yocto_git.bbappend3
5 files changed, 13 insertions, 14 deletions
diff --git a/meta-fishriver/conf/machine/fishriver.conf b/meta-fishriver/conf/machine/fishriver.conf
index 9621f62..e692cac 100644
--- a/meta-fishriver/conf/machine/fishriver.conf
+++ b/meta-fishriver/conf/machine/fishriver.conf
@@ -34,9 +34,3 @@ IMAGE_FSTYPES ?= "ext3 cpio.gz"
34 34
35GLIBC_ADDONS = "nptl" 35GLIBC_ADDONS = "nptl"
36GLIBC_EXTRA_OECONF = "--with-tls" 36GLIBC_EXTRA_OECONF = "--with-tls"
37
38SRCREV_machine_pn-linux-yocto_fishriver ?= "697d84759be192403a8a87ab269196c67a0c2c88"
39SRCREV_meta_pn-linux-yocto_fishriver ?= "f1dc3722d45cdcc92c84ebfecf4ce616d2efed26"
40
41SRCREV_machine_pn-linux-yocto-stable_fishriver ?= "56fe215d3f1a2cc3a5a26482ac9809ba44495695"
42SRCREV_meta_pn-linux-yocto-stable_fishriver ?= "ec26387cb168e9e0976999b528b5a9dd62e3157a"
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 29399ba..0000000
--- a/meta-fishriver/recipes-kernel/linux/linux-yocto-stable_git.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2
3COMPATIBLE_MACHINE_fishriver = "fishriver"
4KMACHINE_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 0000000..4084964
--- /dev/null
+++ b/meta-fishriver/recipes-kernel/linux/linux-yocto_2.6.34.bbappend
@@ -0,0 +1,7 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2
3COMPATIBLE_MACHINE_fishriver = "fishriver"
4KMACHINE_fishriver = "fishriver"
5
6SRCREV_machine_pn-linux-yocto-stable_fishriver ?= "56fe215d3f1a2cc3a5a26482ac9809ba44495695"
7SRCREV_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 0000000..b767109
--- /dev/null
+++ b/meta-fishriver/recipes-kernel/linux/linux-yocto_2.6.37.bbappend
@@ -0,0 +1,6 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2COMPATIBLE_MACHINE_fishriver = "fishriver"
3KMACHINE_fishriver = "yocto/standard/fishriver"
4
5SRCREV_machine_pn-linux-yocto_fishriver ?= "697d84759be192403a8a87ab269196c67a0c2c88"
6SRCREV_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 eec65d8..0000000
--- a/meta-fishriver/recipes-kernel/linux/linux-yocto_git.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2COMPATIBLE_MACHINE_fishriver = "fishriver"
3KMACHINE_fishriver = "yocto/standard/fishriver"