diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-08-12 13:03:22 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-08-21 15:25:33 +0100 |
commit | 348dca519f2d5ba70b8cd3a122c3df09a75ea879 (patch) | |
tree | eeca4337ce624a0b4695bf115e1a33689844b732 /meta | |
parent | cb4c1f78c1233b92b86ff00f66203302007592ef (diff) | |
download | poky-348dca519f2d5ba70b8cd3a122c3df09a75ea879.tar.gz |
linux-yocto-rt/5.4: update to rt32
Integrating the following commit(s) to linux-yocto/5.4:
2739bdb0bfa0 Linux 5.4.54-rt32
0124e412ea96 Linux 5.4.52-rt31
d85676a72421 Linux 5.4.49-rt30
72bbd8083a44 Linux 5.4.48-rt29
(From OE-Core rev: 7c4b2aa7f1b4d047a552072924fb97762d776803)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit b21783c173594e5dac3c437e290b26643382c2e9)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.4.bb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb index ec0beeba76..6d3adb5dbd 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | |||
@@ -11,8 +11,8 @@ python () { | |||
11 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") | 11 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") |
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "37478f8c6f336b271b26e783c14bcaf7fa8ca9a6" | 14 | SRCREV_machine ?= "2739bdb0bfa0d9b423ffa940150e539c80bc0bfd" |
15 | SRCREV_meta ?= "96883b38c16febfa10668d16fe08a5cdc3419872" | 15 | SRCREV_meta ?= "ab5ecb9b0e0afbc0ba3502405f4e3d4e7d170fac" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ | 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ |
18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb index 9881b09a9f..3cc8537973 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | |||
@@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2" | |||
17 | 17 | ||
18 | SRCREV_machine_qemuarm ?= "58d322d637edd20fe24aadfdc0d621f63700c009" | 18 | SRCREV_machine_qemuarm ?= "58d322d637edd20fe24aadfdc0d621f63700c009" |
19 | SRCREV_machine ?= "9fc2fb2e73466a520ee9a3c48b3ca2f5b21415dc" | 19 | SRCREV_machine ?= "9fc2fb2e73466a520ee9a3c48b3ca2f5b21415dc" |
20 | SRCREV_meta ?= "96883b38c16febfa10668d16fe08a5cdc3419872" | 20 | SRCREV_meta ?= "ab5ecb9b0e0afbc0ba3502405f4e3d4e7d170fac" |
21 | 21 | ||
22 | PV = "${LINUX_VERSION}+git${SRCPV}" | 22 | PV = "${LINUX_VERSION}+git${SRCPV}" |
23 | 23 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb index 3829748269..7904850317 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb | |||
@@ -21,7 +21,7 @@ SRCREV_machine_qemux86 ?= "9fc2fb2e73466a520ee9a3c48b3ca2f5b21415dc" | |||
21 | SRCREV_machine_qemux86-64 ?= "9fc2fb2e73466a520ee9a3c48b3ca2f5b21415dc" | 21 | SRCREV_machine_qemux86-64 ?= "9fc2fb2e73466a520ee9a3c48b3ca2f5b21415dc" |
22 | SRCREV_machine_qemumips64 ?= "3a515b583c3efc896cafa4f7f1e784456a360f8f" | 22 | SRCREV_machine_qemumips64 ?= "3a515b583c3efc896cafa4f7f1e784456a360f8f" |
23 | SRCREV_machine ?= "9fc2fb2e73466a520ee9a3c48b3ca2f5b21415dc" | 23 | SRCREV_machine ?= "9fc2fb2e73466a520ee9a3c48b3ca2f5b21415dc" |
24 | SRCREV_meta ?= "96883b38c16febfa10668d16fe08a5cdc3419872" | 24 | SRCREV_meta ?= "ab5ecb9b0e0afbc0ba3502405f4e3d4e7d170fac" |
25 | 25 | ||
26 | # remap qemuarm to qemuarma15 for the 5.4 kernel | 26 | # remap qemuarm to qemuarma15 for the 5.4 kernel |
27 | # KMACHINE_qemuarm ?= "qemuarma15" | 27 | # KMACHINE_qemuarm ?= "qemuarma15" |