From: Alex Kiernan Date: Tue, 18 Sep 2018 15:15:21 +0000 (+0000) Subject: kernel: Fix modules tarball generation with usrmerge X-Git-Tag: uninative-2.3~228 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=62d2d7d12dda69d6019a1a2d5492450487e41bfd;p=openembedded-core.git 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 Signed-off-by: Ross Burton --- 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