summaryrefslogtreecommitdiffstats
path: root/meta-emenlow
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-emenlow
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-emenlow')
-rw-r--r--meta-emenlow/conf/machine/emenlow.conf6
-rw-r--r--meta-emenlow/recipes-kernel/linux/linux-yocto-stable_git.bbappend3
-rw-r--r--meta-emenlow/recipes-kernel/linux/linux-yocto_2.6.34.bbappend6
-rw-r--r--meta-emenlow/recipes-kernel/linux/linux-yocto_2.6.37.bbappend6
-rw-r--r--meta-emenlow/recipes-kernel/linux/linux-yocto_git.bbappend3
5 files changed, 12 insertions, 12 deletions
diff --git a/meta-emenlow/conf/machine/emenlow.conf b/meta-emenlow/conf/machine/emenlow.conf
index 8fe9dd3..b0b7d5e 100644
--- a/meta-emenlow/conf/machine/emenlow.conf
+++ b/meta-emenlow/conf/machine/emenlow.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_emenlow = "7dd88fc03db50b131e4a96e6af8036a836ccc300"
43SRCREV_meta_pn-linux-yocto_emenlow ?= "f1dc3722d45cdcc92c84ebfecf4ce616d2efed26"
44
45SRCREV_machine_pn-linux-yocto-stable_emenlow = "a29743c0a1398798fbc02c0799c8605d91514e14"
46SRCREV_meta_pn-linux-yocto-stable_emenlow ?= "ec26387cb168e9e0976999b528b5a9dd62e3157a"
diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto-stable_git.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto-stable_git.bbappend
deleted file mode 100644
index 77a665d..0000000
--- a/meta-emenlow/recipes-kernel/linux/linux-yocto-stable_git.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2COMPATIBLE_MACHINE_emenlow = "emenlow"
3KMACHINE_emenlow = "emenlow"
diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto_2.6.34.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto_2.6.34.bbappend
new file mode 100644
index 0000000..160b3aa
--- /dev/null
+++ b/meta-emenlow/recipes-kernel/linux/linux-yocto_2.6.34.bbappend
@@ -0,0 +1,6 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2COMPATIBLE_MACHINE_emenlow = "emenlow"
3KMACHINE_emenlow = "emenlow"
4
5SRCREV_machine_pn-linux-yocto_emenlow = "a29743c0a1398798fbc02c0799c8605d91514e14"
6SRCREV_meta_pn-linux-yocto_emenlow ?= "ec26387cb168e9e0976999b528b5a9dd62e3157a"
diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto_2.6.37.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto_2.6.37.bbappend
new file mode 100644
index 0000000..6be0227
--- /dev/null
+++ b/meta-emenlow/recipes-kernel/linux/linux-yocto_2.6.37.bbappend
@@ -0,0 +1,6 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2COMPATIBLE_MACHINE_emenlow = "emenlow"
3KMACHINE_emenlow = "yocto/standard/emenlow"
4
5SRCREV_machine_pn-linux-yocto_emenlow = "7dd88fc03db50b131e4a96e6af8036a836ccc300"
6SRCREV_meta_pn-linux-yocto_emenlow ?= "f1dc3722d45cdcc92c84ebfecf4ce616d2efed26"
diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto_git.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto_git.bbappend
deleted file mode 100644
index 05307b7..0000000
--- a/meta-emenlow/recipes-kernel/linux/linux-yocto_git.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2COMPATIBLE_MACHINE_emenlow = "emenlow"
3KMACHINE_emenlow = "yocto/standard/emenlow"