[oe-commits] [openembedded-core] 08/20: kernel-artifact-names.bbclass, kernel.bbclass: remove prefix and extension from MODULE_TARBALL_* variables

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 43bd7f39157da49f7fb0c2d6d9751059471c8d53
Author: Martin Jansa <martin.jansa at gmail.com>
AuthorDate: Sun Aug 19 22:16:01 2018 +0000

    kernel-artifact-names.bbclass, kernel.bbclass: remove prefix and extension from MODULE_TARBALL_* variables
    
    * 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 at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/kernel-artifact-names.bbclass | 6 ++----
 meta/classes/kernel.bbclass                | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/meta/classes/kernel-artifact-names.bbclass b/meta/classes/kernel-artifact-names.bbclass
index 56352d7..d21450c 100644
--- 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 e47c063..3c8aa59 100644
--- 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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.