diff options
| author | Ryan Eatmon <reatmon@ti.com> | 2023-08-31 14:26:29 -0500 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2023-10-04 05:21:28 -1000 |
| commit | 69fab13b5004b3d394821911dd0b9a2e63e6f73a (patch) | |
| tree | 69aa2fad618b17dc17762443bf49b4a84c519e2b | |
| parent | 0451adb82e602c9891e3459341494e3c600abd0c (diff) | |
| download | poky-69fab13b5004b3d394821911dd0b9a2e63e6f73a.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: f4422831cce168d0b113fb47eebbb480d157cebb)
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 2e669bf797b15d803e7d6a700e449bdc467a4bcc)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | meta/classes-recipe/kernel.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes-recipe/kernel.bbclass b/meta/classes-recipe/kernel.bbclass index 3abd689794..31e4a683d1 100644 --- a/meta/classes-recipe/kernel.bbclass +++ b/meta/classes-recipe/kernel.bbclass | |||
| @@ -445,8 +445,8 @@ kernel_do_install() { | |||
| 445 | unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE | 445 | unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE |
| 446 | if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then | 446 | if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then |
| 447 | oe_runmake DEPMOD=echo MODLIB=${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION} INSTALL_FW_PATH=${D}${nonarch_base_libdir}/firmware modules_install | 447 | oe_runmake DEPMOD=echo MODLIB=${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION} INSTALL_FW_PATH=${D}${nonarch_base_libdir}/firmware modules_install |
| 448 | rm "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/build" | 448 | rm -f "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/build" |
| 449 | rm "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/source" | 449 | rm -f "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/source" |
| 450 | # Remove empty module directories to prevent QA issues | 450 | # Remove empty module directories to prevent QA issues |
| 451 | find "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel" -type d -empty -delete | 451 | find "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel" -type d -empty -delete |
| 452 | else | 452 | else |
