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.kier...@gmail.com>
---

 meta/classes/kernel.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 6b734be2b675..396627e7efa1 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
 
-- 
2.7.4

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Reply via email to