From 66def4d09cbdf1614622a7ab1d84bef312b5f55d Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Mon, 16 Sep 2013 16:57:28 -0500 Subject: meta-crownbay: move crownbay-noemgd to linux-yocto-3.10 Add linux-yocto_3.10 bbappends to meta-crownbay and switch crownbay-noemgd to use them. Leave crownbay at 3.8, since the EMGD kernel branch hasn't yet been made to work with 3.10. Signed-off-by: Tom Zanussi --- meta-crownbay/conf/machine/crownbay-noemgd.conf | 2 +- .../recipes-kernel/linux/linux-yocto-rt_3.10.bbappend | 9 +++++++++ meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend | 12 ++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend create mode 100644 meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend (limited to 'meta-crownbay') diff --git a/meta-crownbay/conf/machine/crownbay-noemgd.conf b/meta-crownbay/conf/machine/crownbay-noemgd.conf index ab4a93fc..1ced7c67 100644 --- a/meta-crownbay/conf/machine/crownbay-noemgd.conf +++ b/meta-crownbay/conf/machine/crownbay-noemgd.conf @@ -6,7 +6,7 @@ #@DESCRIPTION: Machine configuration for Crown Bay systems, without Intel-proprietary graphics bits # i.e. E660 + EG20T -PREFERRED_VERSION_linux-yocto ?= "3.8%" +PREFERRED_VERSION_linux-yocto ?= "3.10%" require conf/machine/include/tune-atom.inc require conf/machine/include/ia32-base.inc diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend new file mode 100644 index 00000000..5c24dcf3 --- /dev/null +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend @@ -0,0 +1,9 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" +KMACHINE_crownbay-noemgd = "crownbay" + +# Update the following to use a different BSP branch or meta SRCREV +#KBRANCH_crownbay-noemgd = "standard/preempt-rt/base" +#SRCREV_machine_pn-linux-yocto-rt_crownbay-noemgd ?= XXXX +#SRCREV_meta_pn-linux-yocto-rt_crownbay-noemgd ?= XXXX diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend new file mode 100644 index 00000000..36e2015d --- /dev/null +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend @@ -0,0 +1,12 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" +KMACHINE_crownbay-noemgd = "crownbay" +KBRANCH_crownbay-noemgd = "standard/crownbay" +KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb" + +LINUX_VERSION = "3.10.11" + +SRCREV_meta_crownbay-noemgd = "285f93bf942e8f6fa678ffc6cc53696ed5400718" +SRCREV_machine_crownbay-noemgd = "702040ac7c7ec66a29b4d147665ccdd0ff015577" + -- cgit v1.2.3-54-g00ecf