diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2016-04-22 15:03:24 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-11 10:33:40 +0100 |
commit | 3db6b646e5390fe196a702fed6ff99300054cbf9 (patch) | |
tree | f5a6624337cfc00ebd72ddf4a9b7a9e2a343bd1e /meta/recipes-kernel | |
parent | ccfa4985f3e8711e1493cfc9e3dfac1b24e0c668 (diff) | |
download | poky-3db6b646e5390fe196a702fed6ff99300054cbf9.tar.gz |
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).
(From OE-Core rev: 7071ab47ce566398b398ac3d24eb3620a0353897)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_4.1.bb | 16 |
3 files changed, 10 insertions, 10 deletions
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" | |||
2 | 2 | ||
3 | require recipes-kernel/linux/linux-yocto.inc | 3 | require recipes-kernel/linux/linux-yocto.inc |
4 | 4 | ||
5 | SRCREV_machine ?= "1947ac40bb819120f1e0dff6ae281cc024ce77bb" | 5 | SRCREV_machine ?= "c97948997745a5bb634829bb520c0765535d223b" |
6 | SRCREV_meta ?= "a4f88c3fad887e1c559d03ae1b531ca267137b69" | 6 | SRCREV_meta ?= "a4f88c3fad887e1c559d03ae1b531ca267137b69" |
7 | 7 | ||
8 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \ | 8 | 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" | |||
9 | KMETA = "kernel-meta" | 9 | KMETA = "kernel-meta" |
10 | KCONF_BSP_AUDIT_LEVEL = "2" | 10 | KCONF_BSP_AUDIT_LEVEL = "2" |
11 | 11 | ||
12 | SRCREV_machine ?= "60332e45b2685ed78ed61f3c27ce931e12b1dfdf" | 12 | SRCREV_machine ?= "d03753ddb28a1141e550a67c99ac95789a424fc5" |
13 | SRCREV_meta ?= "a4f88c3fad887e1c559d03ae1b531ca267137b69" | 13 | SRCREV_meta ?= "a4f88c3fad887e1c559d03ae1b531ca267137b69" |
14 | 14 | ||
15 | PV = "${LINUX_VERSION}+git${SRCPV}" | 15 | 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" | |||
11 | KBRANCH_qemux86-64 ?= "standard/base" | 11 | KBRANCH_qemux86-64 ?= "standard/base" |
12 | KBRANCH_qemumips64 ?= "standard/mti-malta64" | 12 | KBRANCH_qemumips64 ?= "standard/mti-malta64" |
13 | 13 | ||
14 | SRCREV_machine_qemuarm ?= "aea95f103a4f5fccc342bb763af9cfba0623fccc" | 14 | SRCREV_machine_qemuarm ?= "f781d64949f776cbfa5274a548becdcf6b596341" |
15 | SRCREV_machine_qemuarm64 ?= "60332e45b2685ed78ed61f3c27ce931e12b1dfdf" | 15 | SRCREV_machine_qemuarm64 ?= "d03753ddb28a1141e550a67c99ac95789a424fc5" |
16 | SRCREV_machine_qemumips ?= "df85b27d70cb259662a00f5ad860eb3deba63b7f" | 16 | SRCREV_machine_qemumips ?= "192043960081896baaa24c2af702c7124bfe4286" |
17 | SRCREV_machine_qemuppc ?= "60332e45b2685ed78ed61f3c27ce931e12b1dfdf" | 17 | SRCREV_machine_qemuppc ?= "d03753ddb28a1141e550a67c99ac95789a424fc5" |
18 | SRCREV_machine_qemux86 ?= "60332e45b2685ed78ed61f3c27ce931e12b1dfdf" | 18 | SRCREV_machine_qemux86 ?= "d03753ddb28a1141e550a67c99ac95789a424fc5" |
19 | SRCREV_machine_qemux86-64 ?= "60332e45b2685ed78ed61f3c27ce931e12b1dfdf" | 19 | SRCREV_machine_qemux86-64 ?= "d03753ddb28a1141e550a67c99ac95789a424fc5" |
20 | SRCREV_machine_qemumips64 ?= "d371bd9361507ef0b03544f2190a63211fe31c87" | 20 | SRCREV_machine_qemumips64 ?= "351bc6968f63ea6f27cbd7f1678ddc53a9168fd1" |
21 | SRCREV_machine ?= "60332e45b2685ed78ed61f3c27ce931e12b1dfdf" | 21 | SRCREV_machine ?= "d03753ddb28a1141e550a67c99ac95789a424fc5" |
22 | SRCREV_meta ?= "a4f88c3fad887e1c559d03ae1b531ca267137b69" | 22 | SRCREV_meta ?= "a4f88c3fad887e1c559d03ae1b531ca267137b69" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \ |