From 5d0c08cd8bb3f3ce8d23b4ae8b844bba15278049 Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Tue, 17 Jul 2012 22:07:15 -0500 Subject: meta-chiefriver: switch to linux-yocto-3.4 kernel Switch chiefriver to the 3.4 kernel and update kernel SRCREVs. Signed-off-by: Tom Zanussi --- meta-chiefriver/conf/machine/chiefriver.conf | 2 +- .../recipes-kernel/linux/linux-yocto-rt_3.4.bbappend | 8 ++++++++ meta-chiefriver/recipes-kernel/linux/linux-yocto_3.4.bbappend | 10 ++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 meta-chiefriver/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend create mode 100644 meta-chiefriver/recipes-kernel/linux/linux-yocto_3.4.bbappend diff --git a/meta-chiefriver/conf/machine/chiefriver.conf b/meta-chiefriver/conf/machine/chiefriver.conf index 4a359135..b644119c 100644 --- a/meta-chiefriver/conf/machine/chiefriver.conf +++ b/meta-chiefriver/conf/machine/chiefriver.conf @@ -4,7 +4,7 @@ #@DESCRIPTION: Machine configuration for Chief River systems # i.e. Ivy Bridge + Panther Point -PREFERRED_VERSION_linux-yocto ?= "3.2%" +PREFERRED_VERSION_linux-yocto ?= "3.4%" require conf/machine/include/tune-x86_64.inc require conf/machine/include/ia32-base.inc diff --git a/meta-chiefriver/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend b/meta-chiefriver/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend new file mode 100644 index 00000000..9e4a4a07 --- /dev/null +++ b/meta-chiefriver/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend @@ -0,0 +1,8 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +COMPATIBLE_MACHINE_chiefriver = "chiefriver" +KMACHINE_chiefriver = "chiefriver" + +# Update the following to use a different BSP branch or meta SRCREV +#KBRANCH_chiefriver = "standard/preempt-rt/base" +#SRCREV_machine_pn-linux-yocto-rt_chiefriver ?= XXXX +#SRCREV_meta_pn-linux-yocto-rt_chiefriver ?= XXXX diff --git a/meta-chiefriver/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-chiefriver/recipes-kernel/linux/linux-yocto_3.4.bbappend new file mode 100644 index 00000000..3b8c6f32 --- /dev/null +++ b/meta-chiefriver/recipes-kernel/linux/linux-yocto_3.4.bbappend @@ -0,0 +1,10 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +COMPATIBLE_MACHINE_chiefriver = "chiefriver" +KMACHINE_chiefriver = "chiefriver" +KBRANCH_chiefriver = "standard/common-pc-64/chiefriver" + +KERNEL_FEATURES_append_chiefriver = " features/amt/mei" + +SRCREV_machine_pn-linux-yocto_chiefriver ?= "6297e4c1d57e1063bfce297c2e12392348598559" +SRCREV_meta_pn-linux-yocto_chiefriver ?= "c2b5ee363bf2612932301488f3ac0644ff70fc7c" -- cgit v1.2.3-54-g00ecf