]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commitdiff
kernel.bbclass: Add force flag to rm calls
authorRyan Eatmon <reatmon@ti.com>
Tue, 26 Sep 2023 10:45:25 +0000 (10:45 +0000)
committerSteve Sakoman <steve@sakoman.com>
Wed, 27 Sep 2023 16:09:46 +0000 (06:09 -1000)
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)

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>
meta/classes/kernel.bbclass

index f7d199e917198f45c1525afc56ac788b93907c3b..5951347361582251447939c6f9804997a448a040 100644 (file)
@@ -442,8 +442,8 @@ kernel_do_install() {
        unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
        if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
                oe_runmake DEPMOD=echo MODLIB=${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION} INSTALL_FW_PATH=${D}${nonarch_base_libdir}/firmware modules_install
-               rm "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/build"
-               rm "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/source"
+               rm -f "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/build"
+               rm -f "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/source"
                # Remove empty module directories to prevent QA issues
                find "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel" -type d -empty -delete
        else