diff options
| author | Alex Kiernan <alex.kiernan@gmail.com> | 2018-09-18 15:15:21 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-22 11:22:30 -0700 |
| commit | 62d2d7d12dda69d6019a1a2d5492450487e41bfd (patch) | |
| tree | b84b3499777fae70f8d98c96086a41012b5d9a82 | |
| parent | df72761760d453b2dfc7cc2fa1344bb016df9712 (diff) | |
| download | openembedded-core-62d2d7d12dda69d6019a1a2d5492450487e41bfd.tar.gz openembedded-core-62d2d7d12dda69d6019a1a2d5492450487e41bfd.tar.bz2 openembedded-core-62d2d7d12dda69d6019a1a2d5492450487e41bfd.zip | |
kernel: Fix modules tarball generation with usrmerge
When usrmerge is enabled the kernel modules aren't under /lib, but /usr/lib;
ensure we fetch the modules from the correct location so we don't have a
tarball which consists of a single symlink.
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/classes/kernel.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 6b734be2b6..396627e7ef 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -671,8 +671,8 @@ kernel_do_deploy() { install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType} $deployDir/${base_name}.bin done if [ ${MODULE_TARBALL_DEPLOY} = "1" ] && (grep -q -i -e '^CONFIG_MODULES=y$' .config); then - mkdir -p ${D}/lib - tar -cvzf $deployDir/modules-${MODULE_TARBALL_NAME}.tgz -C ${D} lib + mkdir -p ${D}${root_prefix}/lib + tar -cvzf $deployDir/modules-${MODULE_TARBALL_NAME}.tgz -C ${D}${root_prefix} lib ln -sf modules-${MODULE_TARBALL_NAME}.tgz $deployDir/modules-${MODULE_TARBALL_LINK_NAME}.tgz fi |