summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan Eatmon <reatmon@ti.com>2023-10-10 09:26:23 +0100
committerSteve Sakoman <steve@sakoman.com>2023-10-20 05:35:31 -1000
commit42c52c4f24e0c69be4eeec89cdbec360de3d1eee (patch)
treeec18d67b9db4732844ca6a16d1013557fe503d38
parent1a3807e0ca4c3fe4f871aa51f963053766468b6c (diff)
downloadpoky-42c52c4f24e0c69be4eeec89cdbec360de3d1eee.tar.gz
kernel.bbclass: Add force flag to rm calls
The latest 6.5 kernels do not appear to create the source file in ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/source so the recipe errors out when trying to remove it. Simple fix is to add the -f (force) flag to the call. (From OE-Core rev: 2e669bf797b15d803e7d6a700e449bdc467a4bcc) (From OE-Core rev: 844faa7c51ae8ec0966e9c5c3f70a1dbf2222c21) Signed-off-by: Ryan Eatmon <reatmon@ti.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Alexander Sverdlin <alexander.sverdlin@siemens.com> Signed-off-by: Steve Sakoman <steve@sakoman.com> Backported from kirkstone commit 7e177848f97e. Signed-off-by: Paul Barker <paul.barker.ct@bp.renesas.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/classes/kernel.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index ba5b6cf384..ca7530095e 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -405,8 +405,8 @@ kernel_do_install() {
405 unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE 405 unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
406 if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then 406 if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
407 oe_runmake DEPMOD=echo MODLIB=${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION} INSTALL_FW_PATH=${D}${nonarch_base_libdir}/firmware modules_install 407 oe_runmake DEPMOD=echo MODLIB=${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION} INSTALL_FW_PATH=${D}${nonarch_base_libdir}/firmware modules_install
408 rm "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/build" 408 rm -f "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/build"
409 rm "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/source" 409 rm -f "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/source"
410 # If the kernel/ directory is empty remove it to prevent QA issues 410 # If the kernel/ directory is empty remove it to prevent QA issues
411 rmdir --ignore-fail-on-non-empty "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel" 411 rmdir --ignore-fail-on-non-empty "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel"
412 else 412 else