summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-15 12:07:01 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-15 15:57:29 +0100
commitb5845de167b17a125b799fb6a1947e8fd054482c (patch)
tree0ea661d05e5f560dd6491c143d9e0a0968e6c8ae
parentd61d0a1fc80dff446d2019c0c0553714ac8cf629 (diff)
downloadpoky-b5845de167b17a125b799fb6a1947e8fd054482c.tar.gz
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 <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/kernel.bbclass6
1 files changed, 4 insertions, 2 deletions
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() {
200 sed -i 's#-I/usr/include/slang#-I=/usr/include/slang#g' $kerneldir/tools/perf/Makefile 200 sed -i 's#-I/usr/include/slang#-I=/usr/include/slang#g' $kerneldir/tools/perf/Makefile
201 fi 201 fi
202} 202}
203do_install[prefuncs] += "package_get_auto_pr"
203 204
204sysroot_stage_all_append() { 205sysroot_stage_all_append() {
205 sysroot_stage_dir ${D}${KERNEL_SRC_PATH} ${SYSROOT_DESTDIR}${KERNEL_SRC_PATH} 206 sysroot_stage_dir ${D}${KERNEL_SRC_PATH} ${SYSROOT_DESTDIR}${KERNEL_SRC_PATH}
@@ -333,11 +334,11 @@ do_sizecheck[dirs] = "${B}"
333 334
334addtask sizecheck before do_install after do_strip 335addtask sizecheck before do_install after do_strip
335 336
336KERNEL_IMAGE_BASE_NAME ?= "${KERNEL_IMAGETYPE}-${PE}-${PV}-${PR}-${MACHINE}-${DATETIME}" 337KERNEL_IMAGE_BASE_NAME ?= "${KERNEL_IMAGETYPE}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
337# Don't include the DATETIME variable in the sstate package signatures 338# Don't include the DATETIME variable in the sstate package signatures
338KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME" 339KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
339KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}" 340KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}"
340MODULE_IMAGE_BASE_NAME ?= "modules-${PE}-${PV}-${PR}-${MACHINE}-${DATETIME}" 341MODULE_IMAGE_BASE_NAME ?= "modules-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
341MODULE_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME" 342MODULE_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
342MODULE_TARBALL_BASE_NAME ?= "${MODULE_IMAGE_BASE_NAME}.tgz" 343MODULE_TARBALL_BASE_NAME ?= "${MODULE_IMAGE_BASE_NAME}.tgz"
343# Don't include the DATETIME variable in the sstate package signatures 344# Don't include the DATETIME variable in the sstate package signatures
@@ -386,6 +387,7 @@ kernel_do_deploy() {
386 cd - 387 cd -
387} 388}
388do_deploy[dirs] = "${DEPLOYDIR} ${B}" 389do_deploy[dirs] = "${DEPLOYDIR} ${B}"
390do_deploy[prefuncs] += "package_get_auto_pr"
389 391
390addtask deploy before do_build after do_install 392addtask deploy before do_build after do_install
391 393