diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2019-02-09 18:37:05 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-12 14:04:31 +0000 |
commit | 2a68d9fa4b85fb4ffa5ccb5b5ec1d35121cff9fe (patch) | |
tree | 22d3a5576e8dee7d1df5243d8f66e35c826b5ba6 /meta/recipes-kernel | |
parent | 22c2ced2d129336b860c239d49f9042b7203be6c (diff) | |
download | poky-2a68d9fa4b85fb4ffa5ccb5b5ec1d35121cff9fe.tar.gz |
linux-yocto: tweak console boot check
boot/main: don't check console device file on fs when booting with
initrd/initramfs
In case of initrd/initramfs /dev/console might not exist that early
as devtmpfs is mounted a bit later by /init process so disable this
check in that case.
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
(From OE-Core rev: b5bd54b1640c1e59960c260dd6521ba2500df204)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.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.19.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb | 6 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_4.19.bb | 18 |
3 files changed, 14 insertions, 14 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb index 79eebb49f5..591981aa31 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.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 ?= "7759e970a7e106bd37bd62b63ab67bdae54a2152" | 14 | SRCREV_machine ?= "3059029718900250904b9f587e37ba22fb949ea6" |
15 | SRCREV_meta ?= "4c0da29403e242f3d429196cf4a03200211e6ff4" | 15 | SRCREV_meta ?= "5d93f38b0eed56071261895aefecfca287595536" |
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-4.19;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb index 69d0a6136d..bb2ea2d991 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb | |||
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" | |||
15 | KMETA = "kernel-meta" | 15 | KMETA = "kernel-meta" |
16 | KCONF_BSP_AUDIT_LEVEL = "2" | 16 | KCONF_BSP_AUDIT_LEVEL = "2" |
17 | 17 | ||
18 | SRCREV_machine_qemuarm ?= "64017daf053fdb31049248e45f42e0abd55117d3" | 18 | SRCREV_machine_qemuarm ?= "6cc861e796ab19a6827cf9996e7755f1875d553e" |
19 | SRCREV_machine ?= "ad24af0809e17882e33fb4bd77426e691f47b46d" | 19 | SRCREV_machine ?= "11e0e616ed095bb8012e1b4a231254c9656a0193" |
20 | SRCREV_meta ?= "4c0da29403e242f3d429196cf4a03200211e6ff4" | 20 | SRCREV_meta ?= "5d93f38b0eed56071261895aefecfca287595536" |
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_4.19.bb b/meta/recipes-kernel/linux/linux-yocto_4.19.bb index 11f7e15bad..13d6eb0ea0 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.19.bb | |||
@@ -11,15 +11,15 @@ KBRANCH_qemux86 ?= "v4.19/standard/base" | |||
11 | KBRANCH_qemux86-64 ?= "v4.19/standard/base" | 11 | KBRANCH_qemux86-64 ?= "v4.19/standard/base" |
12 | KBRANCH_qemumips64 ?= "v4.19/standard/mti-malta64" | 12 | KBRANCH_qemumips64 ?= "v4.19/standard/mti-malta64" |
13 | 13 | ||
14 | SRCREV_machine_qemuarm ?= "21a0a68be12c2e549fcc63c3253f22123dc46b72" | 14 | SRCREV_machine_qemuarm ?= "0d83500d7377b68aeb42387350bb41dd7dc04315" |
15 | SRCREV_machine_qemuarm64 ?= "ad24af0809e17882e33fb4bd77426e691f47b46d" | 15 | SRCREV_machine_qemuarm64 ?= "11e0e616ed095bb8012e1b4a231254c9656a0193" |
16 | SRCREV_machine_qemumips ?= "27542dfa0e04bf9d8453a172fce459176787fd97" | 16 | SRCREV_machine_qemumips ?= "0169796412b83d8835f3f9b81d19efe008199fdd" |
17 | SRCREV_machine_qemuppc ?= "ad24af0809e17882e33fb4bd77426e691f47b46d" | 17 | SRCREV_machine_qemuppc ?= "11e0e616ed095bb8012e1b4a231254c9656a0193" |
18 | SRCREV_machine_qemux86 ?= "ad24af0809e17882e33fb4bd77426e691f47b46d" | 18 | SRCREV_machine_qemux86 ?= "11e0e616ed095bb8012e1b4a231254c9656a0193" |
19 | SRCREV_machine_qemux86-64 ?= "ad24af0809e17882e33fb4bd77426e691f47b46d" | 19 | SRCREV_machine_qemux86-64 ?= "11e0e616ed095bb8012e1b4a231254c9656a0193" |
20 | SRCREV_machine_qemumips64 ?= "5abad938eff63706ca30fdf09b31f1c7b36f5308" | 20 | SRCREV_machine_qemumips64 ?= "fc7a2bf24e0e39b6a260f8650a3c8d497b8cdcfd" |
21 | SRCREV_machine ?= "ad24af0809e17882e33fb4bd77426e691f47b46d" | 21 | SRCREV_machine ?= "11e0e616ed095bb8012e1b4a231254c9656a0193" |
22 | SRCREV_meta ?= "4c0da29403e242f3d429196cf4a03200211e6ff4" | 22 | SRCREV_meta ?= "5d93f38b0eed56071261895aefecfca287595536" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ |
25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}" | 25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}" |