]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commitdiff
kernel.bbclass: Add force flag to rm calls
authorRyan Eatmon <reatmon@ti.com>
Tue, 10 Oct 2023 08:26:23 +0000 (09:26 +0100)
committerSteve Sakoman <steve@sakoman.com>
Mon, 16 Oct 2023 15:07:13 +0000 (05:07 -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>
Backported from kirkstone commit 7e177848f97e.
Signed-off-by: Paul Barker <paul.barker.ct@bp.renesas.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
meta/classes/kernel.bbclass

index ba5b6cf384a07f7fc2c3afef9bf5bcb7e0f63723..ca7530095e1222b8abc72fc76a8ac117ea37f5e8 100644 (file)
@@ -405,8 +405,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"
                # If the kernel/ directory is empty remove it to prevent QA issues
                rmdir --ignore-fail-on-non-empty "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel"
        else