summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2018-08-19 22:16:01 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-21 14:49:42 +0100
commitb7d0d0b44f01306b36c209f2ef0fe03ce6f3c56f (patch)
tree642991eb2e3317b393c213ab237329288b8a30ae /meta
parentf09947586c5c2c05368651838fea970808ab161d (diff)
downloadpoky-b7d0d0b44f01306b36c209f2ef0fe03ce6f3c56f.tar.gz
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 (From OE-Core rev: 43bd7f39157da49f7fb0c2d6d9751059471c8d53) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/kernel-artifact-names.bbclass6
-rw-r--r--meta/classes/kernel.bbclass4
2 files changed, 4 insertions, 6 deletions
diff --git a/meta/classes/kernel-artifact-names.bbclass b/meta/classes/kernel-artifact-names.bbclass
index 56352d73b3..d21450c914 100644
--- a/meta/classes/kernel-artifact-names.bbclass
+++ b/meta/classes/kernel-artifact-names.bbclass
@@ -7,10 +7,8 @@ KERNEL_DTB_LINK_NAME ?= "${MACHINE}"
7KERNEL_FIT_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" 7KERNEL_FIT_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
8KERNEL_FIT_LINK_NAME ?= "${MACHINE}" 8KERNEL_FIT_LINK_NAME ?= "${MACHINE}"
9 9
10MODULE_IMAGE_NAME ?= "modules-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" 10MODULE_TARBALL_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
11 11MODULE_TARBALL_LINK_NAME ?= "${MACHINE}"
12MODULE_TARBALL_NAME ?= "${MODULE_IMAGE_NAME}.tgz"
13MODULE_TARBALL_LINK_NAME ?= "modules-${MACHINE}.tgz"
14MODULE_TARBALL_DEPLOY ?= "1" 12MODULE_TARBALL_DEPLOY ?= "1"
15 13
16INITRAMFS_NAME ?= "initramfs-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" 14INITRAMFS_NAME ?= "initramfs-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index e47c063f5a..3c8aa5911f 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -672,8 +672,8 @@ kernel_do_deploy() {
672 done 672 done
673 if [ ${MODULE_TARBALL_DEPLOY} = "1" ] && (grep -q -i -e '^CONFIG_MODULES=y$' .config); then 673 if [ ${MODULE_TARBALL_DEPLOY} = "1" ] && (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
674 mkdir -p ${D}/lib 674 mkdir -p ${D}/lib
675 tar -cvzf $deployDir/${MODULE_TARBALL_NAME} -C ${D} lib 675 tar -cvzf $deployDir/modules-${MODULE_TARBALL_NAME}.tgz -C ${D} lib
676 ln -sf ${MODULE_TARBALL_NAME} $deployDir/${MODULE_TARBALL_LINK_NAME} 676 ln -sf modules-${MODULE_TARBALL_NAME}.tgz $deployDir/modules-${MODULE_TARBALL_LINK_NAME}.tgz
677 fi 677 fi
678 678
679 for type in ${KERNEL_IMAGETYPES} ; do 679 for type in ${KERNEL_IMAGETYPES} ; do