diff options
author | Andrey Zhizhikin <andrey.z@gmail.com> | 2021-12-08 14:21:18 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-12-14 22:49:22 +0000 |
commit | 9bb220ccc13a9d7dfb471ba7d49d0b7042f04306 (patch) | |
tree | 8de73d61f4a63fb2ef142fa6880d0e9414fbbb29 /meta | |
parent | b8623317df2f25d8d90c21ce19060260f3dfd49f (diff) | |
download | poky-9bb220ccc13a9d7dfb471ba7d49d0b7042f04306.tar.gz |
lttng-modules: do not search in non-existing folder during install
When CONFIG_TRACEPOINTS is not enabled in kernel config - module
compilation is skipped, which causes the ${D}/${nonarch_base_libdir} not
to be created.
This fails later in do_install:append() due to the fact that find
command in executed for non-existing folder.
Check for folder existence before find command in executed.
(From OE-Core rev: db8a8b53f440f37731c7c5db9561ac46ef59d891)
Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit de0aa1700ed4e6f04b0a233eb1f6d2ac598e7ed8)
Signed-off-by: Aníbal Limón <anibal.limon@linaro.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-modules_2.11.6.bb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.11.6.bb b/meta/recipes-kernel/lttng/lttng-modules_2.11.6.bb index 3fdc8094e9..3145f0298c 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.11.6.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.11.6.bb | |||
@@ -39,7 +39,9 @@ EXTRA_OEMAKE += "KERNELDIR='${STAGING_KERNEL_DIR}'" | |||
39 | 39 | ||
40 | do_install_append() { | 40 | do_install_append() { |
41 | # Delete empty directories to avoid QA failures if no modules were built | 41 | # Delete empty directories to avoid QA failures if no modules were built |
42 | find ${D}/${nonarch_base_libdir} -depth -type d -empty -exec rmdir {} \; | 42 | if [ -d ${D}/${nonarch_base_libdir} ]; then |
43 | find ${D}/${nonarch_base_libdir} -depth -type d -empty -exec rmdir {} \; | ||
44 | fi | ||
43 | } | 45 | } |
44 | 46 | ||
45 | python do_package_prepend() { | 47 | python do_package_prepend() { |