From 7071ab47ce566398b398ac3d24eb3620a0353897 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 22 Apr 2016 15:03:24 -0400 Subject: linux-yocto/4.1: make ltsi content available In the better late than never category, this commit integrates the ltsi content into linux-yocto 4.1. We we already matching LTSI on the kernel version front with a small gap in patches. With this commit, we have a "ltsi" branch that is pure ltsi on the mailine kernel, and then that commit is merged into standard/base (to make it available to all BSPs). Signed-off-by: Bruce Ashfield Signed-off-by: Ross Burton --- meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_4.1.bb | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'meta/recipes-kernel/linux') diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb index 8d02a90959..b0c4520fc7 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb @@ -2,7 +2,7 @@ KBRANCH ?= "standard/preempt-rt/base" require recipes-kernel/linux/linux-yocto.inc -SRCREV_machine ?= "1947ac40bb819120f1e0dff6ae281cc024ce77bb" +SRCREV_machine ?= "c97948997745a5bb634829bb520c0765535d223b" SRCREV_meta ?= "a4f88c3fad887e1c559d03ae1b531ca267137b69" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \ diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb index 1bbfff28a4..ba6ce74e84 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb @@ -9,7 +9,7 @@ LINUX_VERSION ?= "4.1.22" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "60332e45b2685ed78ed61f3c27ce931e12b1dfdf" +SRCREV_machine ?= "d03753ddb28a1141e550a67c99ac95789a424fc5" SRCREV_meta ?= "a4f88c3fad887e1c559d03ae1b531ca267137b69" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.1.bb b/meta/recipes-kernel/linux/linux-yocto_4.1.bb index e61f5b11f9..e644dfc4da 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.1.bb @@ -11,14 +11,14 @@ KBRANCH_qemux86 ?= "standard/base" KBRANCH_qemux86-64 ?= "standard/base" KBRANCH_qemumips64 ?= "standard/mti-malta64" -SRCREV_machine_qemuarm ?= "aea95f103a4f5fccc342bb763af9cfba0623fccc" -SRCREV_machine_qemuarm64 ?= "60332e45b2685ed78ed61f3c27ce931e12b1dfdf" -SRCREV_machine_qemumips ?= "df85b27d70cb259662a00f5ad860eb3deba63b7f" -SRCREV_machine_qemuppc ?= "60332e45b2685ed78ed61f3c27ce931e12b1dfdf" -SRCREV_machine_qemux86 ?= "60332e45b2685ed78ed61f3c27ce931e12b1dfdf" -SRCREV_machine_qemux86-64 ?= "60332e45b2685ed78ed61f3c27ce931e12b1dfdf" -SRCREV_machine_qemumips64 ?= "d371bd9361507ef0b03544f2190a63211fe31c87" -SRCREV_machine ?= "60332e45b2685ed78ed61f3c27ce931e12b1dfdf" +SRCREV_machine_qemuarm ?= "f781d64949f776cbfa5274a548becdcf6b596341" +SRCREV_machine_qemuarm64 ?= "d03753ddb28a1141e550a67c99ac95789a424fc5" +SRCREV_machine_qemumips ?= "192043960081896baaa24c2af702c7124bfe4286" +SRCREV_machine_qemuppc ?= "d03753ddb28a1141e550a67c99ac95789a424fc5" +SRCREV_machine_qemux86 ?= "d03753ddb28a1141e550a67c99ac95789a424fc5" +SRCREV_machine_qemux86-64 ?= "d03753ddb28a1141e550a67c99ac95789a424fc5" +SRCREV_machine_qemumips64 ?= "351bc6968f63ea6f27cbd7f1678ddc53a9168fd1" +SRCREV_machine ?= "d03753ddb28a1141e550a67c99ac95789a424fc5" SRCREV_meta ?= "a4f88c3fad887e1c559d03ae1b531ca267137b69" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \ -- cgit 1.2.3-korg