From 4ca52d6c3c7dca76d2af98fbae21debe7d240a8f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 15 Apr 2013 12:07:01 +0100 Subject: kernel.bbclass: Ensure we have correct version information in deploy data Currently the names used for the kernel in deploy will contain "AUTOINC" instead of the final incremental numbering. This fixes the problem by ensuring data is obtained from the PR service and using the PKG* variables instead of PE/PV/PR directly. [YOCTO #4293] (From OE-Core rev: 1392f959cb8cd50b5a4492899e54f3ed68ef56d7) Signed-off-by: Richard Purdie --- meta/classes/kernel.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'meta/classes/kernel.bbclass') diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 8c8c95b4ea..00e27ef76d 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -200,6 +200,7 @@ kernel_do_install() { sed -i 's#-I/usr/include/slang#-I=/usr/include/slang#g' $kerneldir/tools/perf/Makefile fi } +do_install[prefuncs] += "package_get_auto_pr" sysroot_stage_all_append() { sysroot_stage_dir ${D}${KERNEL_SRC_PATH} ${SYSROOT_DESTDIR}${KERNEL_SRC_PATH} @@ -333,11 +334,11 @@ do_sizecheck[dirs] = "${B}" addtask sizecheck before do_install after do_strip -KERNEL_IMAGE_BASE_NAME ?= "${KERNEL_IMAGETYPE}-${PE}-${PV}-${PR}-${MACHINE}-${DATETIME}" +KERNEL_IMAGE_BASE_NAME ?= "${KERNEL_IMAGETYPE}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}" # Don't include the DATETIME variable in the sstate package signatures KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME" KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}" -MODULE_IMAGE_BASE_NAME ?= "modules-${PE}-${PV}-${PR}-${MACHINE}-${DATETIME}" +MODULE_IMAGE_BASE_NAME ?= "modules-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}" MODULE_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME" MODULE_TARBALL_BASE_NAME ?= "${MODULE_IMAGE_BASE_NAME}.tgz" # Don't include the DATETIME variable in the sstate package signatures @@ -386,6 +387,7 @@ kernel_do_deploy() { cd - } do_deploy[dirs] = "${DEPLOYDIR} ${B}" +do_deploy[prefuncs] += "package_get_auto_pr" addtask deploy before do_build after do_install -- cgit v1.2.3-54-g00ecf