From 749a127f0b813d314c3515fc14dc144d0d44fcfb Mon Sep 17 00:00:00 2001 From: Darren Hart Date: Mon, 7 May 2012 10:29:53 -0700 Subject: fri2: Update SRCREVs for 3.2 Kernel Update the fri2 linux-yocto bbappends to take advantage of the recent fri2 meta updates in the linux-yocto repository: commit 72d9369a79ab91d6dba3ce95fa4769d75be5f1fa Author: Darren Hart Date: Tue May 1 15:13:26 2012 -0700 fri2: Cleanup fri2-$KTYPE.scc files re efi-ext.scc The efi-ext.scc fragment is not part of the standard or preempt-rt standard features. It is instead a BSP specific feature added to these ktypes. Rearrange the meta-data accordingly. Signed-off-by: Darren Hart commit dbcb1205e3fb95b32f1856e4bf6745fe52f5e5f4 Author: Darren Hart Date: Tue May 1 15:13:25 2012 -0700 fri2: Use emgd-1.10 feature and branch Update the fri2-standard.scc description to use the new emgd feature and branch name. Without this change the emgd driver is not merged and not built. Signed-off-by: Darren Hart Signed-off-by: Darren Hart --- meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend | 8 ++++++-- meta-fri2/recipes-kernel/linux/linux-yocto_3.2.bbappend | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'meta-fri2') diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend index c43975fb..fea48518 100644 --- a/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend +++ b/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend @@ -2,10 +2,14 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" COMPATIBLE_MACHINE_fri2 = "fri2" KMACHINE_fri2 = "fri2" -KBRANCH_fri2 = "standard/preempt-rt/base" +#KBRANCH_fri2 = "standard/preempt-rt/base" +SRCREV_machine_pn-linux-yocto_fri2 ?= "44e0381c0e0d46d3b9f171a58cb0ec5c2077b176" +SRCREV_meta_pn-linux-yocto_fri2 ?= "6b3d4e09aa2531e9649f3f03827b7efbccfcec03" COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" KMACHINE_fri2-noemgd = "fri2" -KBRANCH_fri2-noemgd = "standard/preempt-rt/base" +#KBRANCH_fri2-noemgd = "standard/preempt-rt/base" +SRCREV_machine_pn-linux-yocto_fri2-noemgd ?= "44e0381c0e0d46d3b9f171a58cb0ec5c2077b176" +SRCREV_meta_pn-linux-yocto_fri2-noemgd ?= "6b3d4e09aa2531e9649f3f03827b7efbccfcec03" module_autoload_iwlwifi = "iwlwifi" diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto_3.2.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto_3.2.bbappend index c125e9a8..9622ce9e 100644 --- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.2.bbappend +++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.2.bbappend @@ -3,9 +3,13 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" COMPATIBLE_MACHINE_fri2 = "fri2" KMACHINE_fri2 = "fri2" KBRANCH_fri2 = "standard/default/fri2" +SRCREV_machine_pn-linux-yocto_fri2 ?= "44e0381c0e0d46d3b9f171a58cb0ec5c2077b176" +SRCREV_meta_pn-linux-yocto_fri2 ?= "6b3d4e09aa2531e9649f3f03827b7efbccfcec03" COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" KMACHINE_fri2-noemgd = "fri2" KBRANCH_fri2-noemgd = "standard/default/fri2" +SRCREV_machine_pn-linux-yocto_fri2-noemgd ?= "44e0381c0e0d46d3b9f171a58cb0ec5c2077b176" +SRCREV_meta_pn-linux-yocto_fri2-noemgd ?= "6b3d4e09aa2531e9649f3f03827b7efbccfcec03" module_autoload_iwlwifi = "iwlwifi" -- cgit v1.2.3-54-g00ecf