kernel-artifact-names.bbclass, kernel.bbclass: remove prefix and extension from MODUL...

* for consistency with other artifacts variables, include only the version string, not the actual name or extension
* changing .tgz to something else in the MODULE_TARBALL_NAME variable only wouldn't make much sense
  because then kernel.bbclass still calls "tar -cvzf" to create it

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/kernel-artifact-names.bbclass b/meta/classes/kernel-artifact-names.bbclass
index 56352d73b3a9566144c9c1c67bfbca3bb355697b..d21450c9147047bbdf0111020252111a7bf41086 100644 (file)
--- a/meta/classes/kernel-artifact-names.bbclass
+++ b/meta/classes/kernel-artifact-names.bbclass
@@ -7,10 +7,8 @@ KERNEL_DTB_LINK_NAME ?= "${MACHINE}"
 KERNEL_FIT_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
 KERNEL_FIT_LINK_NAME ?= "${MACHINE}"
 
-MODULE_IMAGE_NAME ?= "modules-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
-
-MODULE_TARBALL_NAME ?= "${MODULE_IMAGE_NAME}.tgz"
-MODULE_TARBALL_LINK_NAME ?= "modules-${MACHINE}.tgz"
+MODULE_TARBALL_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
+MODULE_TARBALL_LINK_NAME ?= "${MACHINE}"
 MODULE_TARBALL_DEPLOY ?= "1"
 
 INITRAMFS_NAME ?= "initramfs-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index e47c063f5ab4535c1f553ea625da20f950a027ab..3c8aa5911f6a9f0ec05fc06cced6a626c236f6a6 100644 (file)
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -672,8 +672,8 @@ kernel_do_deploy() {
        done
        if [ ${MODULE_TARBALL_DEPLOY} = "1" ] && (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
                mkdir -p ${D}/lib
-               tar -cvzf $deployDir/${MODULE_TARBALL_NAME} -C ${D} lib
-               ln -sf ${MODULE_TARBALL_NAME} $deployDir/${MODULE_TARBALL_LINK_NAME}
+               tar -cvzf $deployDir/modules-${MODULE_TARBALL_NAME}.tgz -C ${D} lib
+               ln -sf modules-${MODULE_TARBALL_NAME}.tgz $deployDir/modules-${MODULE_TARBALL_LINK_NAME}.tgz
        fi
 
        for type in ${KERNEL_IMAGETYPES} ; do