From 70c5c968af465e4bbd0fa9d304a27b2398802aec Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Thu, 30 Oct 2025 13:12:18 -0400 Subject: [PATCH] linux-yocto/6.17: fix rdinit boot warning Integrating the following commit(s) to linux-yocto/6.17: 1/1 [ Author: Bruce Ashfield Email: bruce.ashfield@gmail.com Subject: boot: only emit rdinit warning on initramfs boot Date: Mon, 27 Oct 2025 09:47:05 -0400 commit 98aa4d5d242d3a73 [init/main.c: add warning when file specified in rdinit is inaccessible] promoted a long time check to be visible on boot. The issue is that it is always issued even when an initramfs boot is not used. To avoid needing to completely disable CONFIG_BLK_DEV_INITRD and not have the warning issues when an initramfs isn't used, we add checks for the existence and size of an initramfs before allowing the warning to be generated. Signed-off-by: Bruce Ashfield ] (From OE-Core rev: 32b64d9e138b42aa5747f6d3328b105fbfbcc6eb) Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- .../linux/linux-yocto-rt_6.17.bb | 4 ++-- .../linux/linux-yocto-tiny_6.17.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto_6.17.bb | 20 +++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.17.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.17.bb index 5af16f9b61..2e3b05c563 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.17.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.17.bb @@ -14,8 +14,8 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "268abc460d21fe8510bc8a521f3ea887f2bbeef0" -SRCREV_meta ?= "8f5d87f8cae63175d9a7d6b8791864df15b327ec" +SRCREV_machine ?= "ded5de96729dc397870572482c44c65e4c353998" +SRCREV_meta ?= "7b13aa26166b61951a03005f72d158543ad9f3c8" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.17;destsuffix=${KMETA};protocol=https" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.17.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.17.bb index 81a24b6bc9..4ed894239f 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.17.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.17.bb @@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "d76cb43db46c5d45e25df34484c87f5e545bf4c5" -SRCREV_meta ?= "8f5d87f8cae63175d9a7d6b8791864df15b327ec" +SRCREV_machine ?= "3b2f001e6a236aaf17bf11005dc18cef6f13f7b3" +SRCREV_meta ?= "7b13aa26166b61951a03005f72d158543ad9f3c8" PV = "${LINUX_VERSION}+git" diff --git a/meta/recipes-kernel/linux/linux-yocto_6.17.bb b/meta/recipes-kernel/linux/linux-yocto_6.17.bb index 9d2f51ad41..1a1078daaa 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.17.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.17.bb @@ -18,18 +18,18 @@ KBRANCH:qemux86-64 ?= "v6.17/standard/base" KBRANCH:qemuloongarch64 ?= "v6.17/standard/base" KBRANCH:qemumips64 ?= "v6.17/standard/mti-malta" -SRCREV_machine:qemuarm ?= "23c78022fc97ea5ebc19ea8fb86d324c23a6fbaa" -SRCREV_machine:qemuarm64 ?= "d76cb43db46c5d45e25df34484c87f5e545bf4c5" -SRCREV_machine:qemuloongarch64 ?= "d76cb43db46c5d45e25df34484c87f5e545bf4c5" +SRCREV_machine:qemuarm ?= "d71de08747bc2f9b9b4a67baec689847c89f4fec" +SRCREV_machine:qemuarm64 ?= "3b2f001e6a236aaf17bf11005dc18cef6f13f7b3" +SRCREV_machine:qemuloongarch64 ?= "3b2f001e6a236aaf17bf11005dc18cef6f13f7b3" SRCREV_machine:qemumips ?= "62ea92a539f58803a222be98b81118403074206e" -SRCREV_machine:qemuppc ?= "d76cb43db46c5d45e25df34484c87f5e545bf4c5" -SRCREV_machine:qemuriscv64 ?= "d76cb43db46c5d45e25df34484c87f5e545bf4c5" -SRCREV_machine:qemuriscv32 ?= "d76cb43db46c5d45e25df34484c87f5e545bf4c5" -SRCREV_machine:qemux86 ?= "d76cb43db46c5d45e25df34484c87f5e545bf4c5" -SRCREV_machine:qemux86-64 ?= "d76cb43db46c5d45e25df34484c87f5e545bf4c5" +SRCREV_machine:qemuppc ?= "3b2f001e6a236aaf17bf11005dc18cef6f13f7b3" +SRCREV_machine:qemuriscv64 ?= "3b2f001e6a236aaf17bf11005dc18cef6f13f7b3" +SRCREV_machine:qemuriscv32 ?= "3b2f001e6a236aaf17bf11005dc18cef6f13f7b3" +SRCREV_machine:qemux86 ?= "3b2f001e6a236aaf17bf11005dc18cef6f13f7b3" +SRCREV_machine:qemux86-64 ?= "3b2f001e6a236aaf17bf11005dc18cef6f13f7b3" SRCREV_machine:qemumips64 ?= "9fb4ff0187c85426f21fd40d4c61b742800f65c4" -SRCREV_machine ?= "d76cb43db46c5d45e25df34484c87f5e545bf4c5" -SRCREV_meta ?= "8f5d87f8cae63175d9a7d6b8791864df15b327ec" +SRCREV_machine ?= "3b2f001e6a236aaf17bf11005dc18cef6f13f7b3" +SRCREV_meta ?= "7b13aa26166b61951a03005f72d158543ad9f3c8" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the /base branch, which is pure upstream -stable, and the same