summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan Eatmon <reatmon@ti.com>2023-09-26 10:45:25 +0000
committerSteve Sakoman <steve@sakoman.com>2023-09-30 09:43:59 -1000
commit0e4966eb77928a07230e031d6d9c477c01ec9cce (patch)
tree48e57080c1e3084f85277b5eb8bb89b5026b0421
parent6b6a1612733c5652ca4a9473a0a8e944b68e973a (diff)
downloadpoky-0e4966eb77928a07230e031d6d9c477c01ec9cce.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: 7e177848f97eb9958619c28b5e5dadee12f67507) 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>
-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 f7d199e917..5951347361 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -442,8 +442,8 @@ kernel_do_install() {
442 unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE 442 unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
443 if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then 443 if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
444 oe_runmake DEPMOD=echo MODLIB=${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION} INSTALL_FW_PATH=${D}${nonarch_base_libdir}/firmware modules_install 444 oe_runmake DEPMOD=echo MODLIB=${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION} INSTALL_FW_PATH=${D}${nonarch_base_libdir}/firmware modules_install
445 rm "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/build" 445 rm -f "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/build"
446 rm "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/source" 446 rm -f "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/source"
447 # Remove empty module directories to prevent QA issues 447 # Remove empty module directories to prevent QA issues
448 find "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel" -type d -empty -delete 448 find "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel" -type d -empty -delete
449 else 449 else