summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2018-07-09 15:05:00 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-10 17:33:00 +0100
commitd0389bf1cd63154ed2cce159ee37d7a4f1fd72a7 (patch)
tree05369397e8ab8a44987301185d0ec630a5a4be3e
parentc159b6249a61211d9fa0ec9ac9ac426cf71b9a5e (diff)
downloadpoky-d0389bf1cd63154ed2cce159ee37d7a4f1fd72a7.tar.gz
kernel.bbclass: move variables for kernel artifacts names to separate bbclass
* this makes it easier to access these variables from some other bbclass e.g. sdcard_image-rpi.bbclass in meta-raspberry where we need to know how some files in deploy are named, but we cannot inherit kernel.bbclass as it's used in image recipe not kernel recipe * alternatively we can move these to bitbake.conf like similar image variables are: meta/conf/bitbake.conf:IMAGE_BASENAME = "${PN}" meta/conf/bitbake.conf:IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DATETIME}" meta/conf/bitbake.conf:IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${MACHINE}" (From OE-Core rev: 7d0ef0eaa1bfe97015a774c26f5791622e7e8b12) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/kernel-artifact-names.bbclass19
-rw-r--r--meta/classes/kernel.bbclass18
2 files changed, 20 insertions, 17 deletions
diff --git a/meta/classes/kernel-artifact-names.bbclass b/meta/classes/kernel-artifact-names.bbclass
new file mode 100644
index 0000000000..d696888322
--- /dev/null
+++ b/meta/classes/kernel-artifact-names.bbclass
@@ -0,0 +1,19 @@
1KERNEL_IMAGE_BASE_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
2# Don't include the DATETIME variable in the sstate package signatures
3KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
4KERNEL_IMAGE_SYMLINK_NAME ?= "${MACHINE}"
5
6KERNEL_DTB_BASE_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
7KERNEL_DTB_BASE_NAME[vardepsexclude] = "DATETIME"
8KERNEL_DTB_SYMLINK_NAME ?= "${MACHINE}"
9
10MODULE_IMAGE_BASE_NAME ?= "modules-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
11MODULE_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
12
13MODULE_TARBALL_BASE_NAME ?= "${MODULE_IMAGE_BASE_NAME}.tgz"
14MODULE_TARBALL_SYMLINK_NAME ?= "modules-${MACHINE}.tgz"
15MODULE_TARBALL_DEPLOY ?= "1"
16
17INITRAMFS_BASE_NAME ?= "initramfs-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
18INITRAMFS_BASE_NAME[vardepsexclude] = "DATETIME"
19INITRAMFS_SYMLINK_NAME ?= "initramfs-${MACHINE}"
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 0045cec819..42efa382ad 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -657,23 +657,7 @@ do_sizecheck[dirs] = "${B}"
657 657
658addtask sizecheck before do_install after do_strip 658addtask sizecheck before do_install after do_strip
659 659
660KERNEL_IMAGE_BASE_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}" 660inherit kernel-artifact-names
661# Don't include the DATETIME variable in the sstate package signatures
662KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
663KERNEL_IMAGE_SYMLINK_NAME ?= "${MACHINE}"
664KERNEL_DTB_BASE_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
665KERNEL_DTB_BASE_NAME[vardepsexclude] = "DATETIME"
666KERNEL_DTB_SYMLINK_NAME ?= "${MACHINE}"
667MODULE_IMAGE_BASE_NAME ?= "modules-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
668MODULE_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
669MODULE_TARBALL_BASE_NAME ?= "${MODULE_IMAGE_BASE_NAME}.tgz"
670# Don't include the DATETIME variable in the sstate package signatures
671MODULE_TARBALL_SYMLINK_NAME ?= "modules-${MACHINE}.tgz"
672MODULE_TARBALL_DEPLOY ?= "1"
673
674INITRAMFS_BASE_NAME ?= "initramfs-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
675INITRAMFS_BASE_NAME[vardepsexclude] = "DATETIME"
676INITRAMFS_SYMLINK_NAME ?= "initramfs-${MACHINE}"
677 661
678kernel_do_deploy() { 662kernel_do_deploy() {
679 deployDir="${DEPLOYDIR}" 663 deployDir="${DEPLOYDIR}"