summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2011-08-03 16:14:36 (GMT)
committerTom Zanussi <tom.zanussi@intel.com>2011-08-25 01:31:11 (GMT)
commitd5130815aff9d230c44ed0be60ca06bb1cb4225a (patch)
treeb371fb783c75bde527afbda21ae9b33c084bb5b7
parentfb15cc4e1c4be75c81acaf6a1dd33675a9142975 (diff)
downloadmeta-intel-d5130815aff9d230c44ed0be60ca06bb1cb4225a.tar.gz
meta-crownbay: switch to linux-yocto 3.0 kernel
Switch crownbay and crownbay-noemgd 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-crownbay/conf/machine/crownbay-noemgd.conf2
-rw-r--r--meta-crownbay/conf/machine/crownbay.conf2
-rw-r--r--meta-crownbay/recipes-kernel/linux/linux-yocto_3.0.bbappend15
3 files changed, 19 insertions, 0 deletions
diff --git a/meta-crownbay/conf/machine/crownbay-noemgd.conf b/meta-crownbay/conf/machine/crownbay-noemgd.conf
index 0219bd1..30c575a 100644
--- a/meta-crownbay/conf/machine/crownbay-noemgd.conf
+++ b/meta-crownbay/conf/machine/crownbay-noemgd.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%"
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-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf
index 323c8c1..581b976 100644
--- a/meta-crownbay/conf/machine/crownbay.conf
+++ b/meta-crownbay/conf/machine/crownbay.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%"
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-crownbay/recipes-kernel/linux/linux-yocto_3.0.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.0.bbappend
new file mode 100644
index 0000000..c9aef72
--- /dev/null
+++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.0.bbappend
@@ -0,0 +1,15 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2
3COMPATIBLE_MACHINE_crownbay = "crownbay"
4KMACHINE_crownbay = "yocto/standard/crownbay"
5KERNEL_FEATURES_append_crownbay += " cfg/smp.scc"
6
7COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd"
8KMACHINE_crownbay-noemgd = "yocto/standard/crownbay"
9KERNEL_FEATURES_append_crownbay-noemgd += " cfg/smp.scc"
10
11SRCREV_machine_pn-linux-yocto_crownbay ?= "9a259cf4f6d404db2820642df755a295bbfb7fe7"
12SRCREV_meta_pn-linux-yocto_crownbay ?= "fe8eac15e144a35a716cd32c9d2b296ecd5202ac"
13
14SRCREV_machine_pn-linux-yocto_crownbay-noemgd ?= "9a259cf4f6d404db2820642df755a295bbfb7fe7"
15SRCREV_meta_pn-linux-yocto_crownbay-noemgd ?= "fe8eac15e144a35a716cd32c9d2b296ecd5202ac"