diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-08-28 12:21:05 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-09-02 00:52:09 +0100 |
commit | 76d2bd150b4b47ca41b88f7edecd6b74b9792735 (patch) | |
tree | a6a10ab7d30d08a437b8bf08d08ffafe46558e19 /meta/recipes-kernel | |
parent | e792cc1d52833df57eda12c054200000f3727c0c (diff) | |
download | poky-76d2bd150b4b47ca41b88f7edecd6b74b9792735.tar.gz |
linux-yocto/4.12: fix yaffs2 build
Yaffs2 needs some tweaks to build against the 4.12 kernel, we
import the following two commits:
084d8ae2f349 fs: yaffs2: includes the missing header file
595f7d1759d9 fs: yaffs2: replace CURRENT_TIME by other appropriate apis
(From OE-Core rev: c62fa4393014caa526875b7d7a07fc634314f279)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.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.12.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_4.12.bb | 18 |
3 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb index 49f5bf3522..1b1bf9f762 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb | |||
@@ -11,8 +11,8 @@ python () { | |||
11 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") | 11 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") |
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "d09f2ce584d60ecb7890550c22a80c48b83c2e19" | 14 | SRCREV_machine ?= "084d8ae2f349a7621e1e51c81b4494b123f3c09a" |
15 | SRCREV_meta ?= "edb42d48052dee4dbc3ed9d5e1e39c1375e85fe0" | 15 | SRCREV_meta ?= "9acd7f92a1b3248310ec17407063f968732ad130" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;branch=${KBRANCH};name=machine \ | 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;branch=${KBRANCH};name=machine \ |
18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.12;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.12;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb index ff395e0ad7..bdf660e6ce 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb | |||
@@ -9,8 +9,8 @@ LINUX_VERSION ?= "4.12.7" | |||
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 ?= "d09f2ce584d60ecb7890550c22a80c48b83c2e19" | 12 | SRCREV_machine ?= "084d8ae2f349a7621e1e51c81b4494b123f3c09a" |
13 | SRCREV_meta ?= "edb42d48052dee4dbc3ed9d5e1e39c1375e85fe0" | 13 | SRCREV_meta ?= "9acd7f92a1b3248310ec17407063f968732ad130" |
14 | 14 | ||
15 | PV = "${LINUX_VERSION}+git${SRCPV}" | 15 | PV = "${LINUX_VERSION}+git${SRCPV}" |
16 | 16 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.12.bb b/meta/recipes-kernel/linux/linux-yocto_4.12.bb index ce223ca081..964dbce3e7 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.12.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.12.bb | |||
@@ -11,15 +11,15 @@ 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 ?= "dc7fc6edebaa6d20967c953a2cd27bac5e955463" | 14 | SRCREV_machine_qemuarm ?= "a5227887cfadd94068717e8166879bf88d00ef73" |
15 | SRCREV_machine_qemuarm64 ?= "d09f2ce584d60ecb7890550c22a80c48b83c2e19" | 15 | SRCREV_machine_qemuarm64 ?= "084d8ae2f349a7621e1e51c81b4494b123f3c09a" |
16 | SRCREV_machine_qemumips ?= "ff11a70047bbab2c801f9b4f7b9d4bc1d38dbed1" | 16 | SRCREV_machine_qemumips ?= "a6983bac4e93ba7e892f666ad8c58b32c2d10945" |
17 | SRCREV_machine_qemuppc ?= "d09f2ce584d60ecb7890550c22a80c48b83c2e19" | 17 | SRCREV_machine_qemuppc ?= "084d8ae2f349a7621e1e51c81b4494b123f3c09a" |
18 | SRCREV_machine_qemux86 ?= "d09f2ce584d60ecb7890550c22a80c48b83c2e19" | 18 | SRCREV_machine_qemux86 ?= "084d8ae2f349a7621e1e51c81b4494b123f3c09a" |
19 | SRCREV_machine_qemux86-64 ?= "d09f2ce584d60ecb7890550c22a80c48b83c2e19" | 19 | SRCREV_machine_qemux86-64 ?= "084d8ae2f349a7621e1e51c81b4494b123f3c09a" |
20 | SRCREV_machine_qemumips64 ?= "a4d6ef2c5428e57f7f9982d230b09459683ddb1d" | 20 | SRCREV_machine_qemumips64 ?= "b344c1888b03e40683ba109bb45b44e9cf4d1eb4" |
21 | SRCREV_machine ?= "d09f2ce584d60ecb7890550c22a80c48b83c2e19" | 21 | SRCREV_machine ?= "084d8ae2f349a7621e1e51c81b4494b123f3c09a" |
22 | SRCREV_meta ?= "edb42d48052dee4dbc3ed9d5e1e39c1375e85fe0" | 22 | SRCREV_meta ?= "9acd7f92a1b3248310ec17407063f968732ad130" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;name=machine;branch=${KBRANCH}; \ |
25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.12;destsuffix=${KMETA}" | 25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.12;destsuffix=${KMETA}" |