summaryrefslogtreecommitdiffstats
path: root/meta-crownbay
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-crownbay
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-crownbay')
-rw-r--r--meta-crownbay/conf/machine/crownbay-noemgd.conf6
-rw-r--r--meta-crownbay/conf/machine/crownbay.conf6
-rw-r--r--meta-crownbay/recipes-kernel/linux/linux-yocto-stable_git.bbappend9
-rw-r--r--meta-crownbay/recipes-kernel/linux/linux-yocto_2.6.34.bbappend15
-rw-r--r--meta-crownbay/recipes-kernel/linux/linux-yocto_2.6.37.bbappend (renamed from meta-crownbay/recipes-kernel/linux/linux-yocto_git.bbappend)6
5 files changed, 21 insertions, 21 deletions
diff --git a/meta-crownbay/conf/machine/crownbay-noemgd.conf b/meta-crownbay/conf/machine/crownbay-noemgd.conf
index 1916b2f..cc0b2eb 100644
--- a/meta-crownbay/conf/machine/crownbay-noemgd.conf
+++ b/meta-crownbay/conf/machine/crownbay-noemgd.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_crownbay-noemgd ?= "88ea187941f262518b3b8194e042f0270fdf27c4"
39SRCREV_meta_pn-linux-yocto_crownbay-noemgd ?= "f1dc3722d45cdcc92c84ebfecf4ce616d2efed26"
40
41SRCREV_machine_pn-linux-yocto-stable_crownbay ?= "56fe215d3f1a2cc3a5a26482ac9809ba44495695"
42SRCREV_meta_pn-linux-yocto-stable_crownbay ?= "ec26387cb168e9e0976999b528b5a9dd62e3157a"
diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf
index 6634102..c66b859 100644
--- a/meta-crownbay/conf/machine/crownbay.conf
+++ b/meta-crownbay/conf/machine/crownbay.conf
@@ -38,9 +38,3 @@ IMAGE_FSTYPES ?= "ext3 cpio.gz"
38 38
39GLIBC_ADDONS = "nptl" 39GLIBC_ADDONS = "nptl"
40GLIBC_EXTRA_OECONF = "--with-tls" 40GLIBC_EXTRA_OECONF = "--with-tls"
41
42SRCREV_machine_pn-linux-yocto_crownbay ?= "88ea187941f262518b3b8194e042f0270fdf27c4"
43SRCREV_meta_pn-linux-yocto_crownbay ?= "f1dc3722d45cdcc92c84ebfecf4ce616d2efed26"
44
45SRCREV_machine_pn-linux-yocto-stable_crownbay ?= "56fe215d3f1a2cc3a5a26482ac9809ba44495695"
46SRCREV_meta_pn-linux-yocto-stable_crownbay ?= "ec26387cb168e9e0976999b528b5a9dd62e3157a"
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto-stable_git.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto-stable_git.bbappend
deleted file mode 100644
index 570f8d4..0000000
--- a/meta-crownbay/recipes-kernel/linux/linux-yocto-stable_git.bbappend
+++ /dev/null
@@ -1,9 +0,0 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2
3COMPATIBLE_MACHINE_crownbay = "crownbay"
4KMACHINE_crownbay = "crownbay"
5KERNEL_FEATURES_append_crownbay += " cfg/smp.scc"
6
7COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd"
8KMACHINE_crownbay-noemgd = "crownbay"
9KERNEL_FEATURES_append_crownbay-noemgd += " cfg/smp.scc"
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_2.6.34.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_2.6.34.bbappend
new file mode 100644
index 0000000..6f3694b
--- /dev/null
+++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_2.6.34.bbappend
@@ -0,0 +1,15 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2
3COMPATIBLE_MACHINE_crownbay = "crownbay"
4KMACHINE_crownbay = "crownbay"
5KERNEL_FEATURES_append_crownbay += " cfg/smp.scc"
6
7COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd"
8KMACHINE_crownbay-noemgd = "crownbay"
9KERNEL_FEATURES_append_crownbay-noemgd += " cfg/smp.scc"
10
11SRCREV_machine_pn-linux-yocto_crownbay ?= "56fe215d3f1a2cc3a5a26482ac9809ba44495695"
12SRCREV_meta_pn-linux-yocto_crownbay ?= "ec26387cb168e9e0976999b528b5a9dd62e3157a"
13
14RCREV_machine_pn-linux-yocto_crownbay-noemgd ?= "56fe215d3f1a2cc3a5a26482ac9809ba44495695"
15SRCREV_meta_pn-linux-yocto_crownbay-noemgd ?= "ec26387cb168e9e0976999b528b5a9dd62e3157a"
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_git.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_2.6.37.bbappend
index cdae000..1a62b38 100644
--- a/meta-crownbay/recipes-kernel/linux/linux-yocto_git.bbappend
+++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_2.6.37.bbappend
@@ -7,3 +7,9 @@ KERNEL_FEATURES_append_crownbay += " cfg/smp.scc"
7COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" 7COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd"
8KMACHINE_crownbay-noemgd = "yocto/standard/crownbay" 8KMACHINE_crownbay-noemgd = "yocto/standard/crownbay"
9KERNEL_FEATURES_append_crownbay-noemgd += " cfg/smp.scc" 9KERNEL_FEATURES_append_crownbay-noemgd += " cfg/smp.scc"
10
11SRCREV_machine_pn-linux-yocto_crownbay ?= "88ea187941f262518b3b8194e042f0270fdf27c4"
12SRCREV_meta_pn-linux-yocto_crownbay ?= "f1dc3722d45cdcc92c84ebfecf4ce616d2efed26"
13
14SRCREV_machine_pn-linux-yocto_crownbay-noemgd ?= "88ea187941f262518b3b8194e042f0270fdf27c4"
15SRCREV_meta_pn-linux-yocto_crownbay-noemgd ?= "f1dc3722d45cdcc92c84ebfecf4ce616d2efed26"