summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2011-08-08 18:15:52 (GMT)
committerTom Zanussi <tom.zanussi@intel.com>2011-08-08 18:15:52 (GMT)
commit58f707b29e20c2f1712da2e0c1eedc78ea7de6c8 (patch)
tree4480ad46cd3e9c25e7177b3caf2cfb0884860776
parent2d2056620f7aaf825834bfce09b762aed8951b89 (diff)
downloadmeta-intel-58f707b29e20c2f1712da2e0c1eedc78ea7de6c8.tar.gz
meta-fishriver: switch to linux-yocto 3.0 kernel
Switch fishriver to the 3.0 kernel, lock it down, and update kernel SRCREVs. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
-rw-r--r--meta-fishriver/conf/machine/fishriver.conf2
-rw-r--r--meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.bbappend6
2 files changed, 8 insertions, 0 deletions
diff --git a/meta-fishriver/conf/machine/fishriver.conf b/meta-fishriver/conf/machine/fishriver.conf
index c59e81d..a44d896 100644
--- a/meta-fishriver/conf/machine/fishriver.conf
+++ b/meta-fishriver/conf/machine/fishriver.conf
@@ -12,6 +12,8 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
12KERNEL_IMAGETYPE = "bzImage" 12KERNEL_IMAGETYPE = "bzImage"
13 13
14PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" 14PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
15PREFERRED_VERSION_linux-yocto = "3.0+git%"
16
15PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" 17PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
16PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" 18PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
17PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" 19PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
diff --git a/meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.bbappend
new file mode 100644
index 0000000..e96751e
--- /dev/null
+++ b/meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.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 ?= "e556c2a9403cef5688b55283b1d2bd4ca704dc59"
6SRCREV_meta_pn-linux-yocto_fishriver ?= "76b3679beff6c640388a609ccf87f46bb7bf0f2b"