Openembedded Core Discussions
 help / color / mirror / Atom feed
* [PATCH 1/7] kernel.bbclass: Ensure we have correct version information in deploy data
@ 2013-04-15 11:07 Richard Purdie
  2013-04-15 11:07 ` [PATCH] recipes: Fix ALLOW_EMPTY with no package specified Richard Purdie
                   ` (7 more replies)
  0 siblings, 8 replies; 16+ messages in thread
From: Richard Purdie @ 2013-04-15 11:07 UTC (permalink / raw)
  To: openembedded-core

Currently the names used for the kernel in deploy will contain "AUTOREV"
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.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/classes/kernel.bbclass |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 8c8c95b..00e27ef 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
 
-- 
1.7.10.4




^ permalink raw reply related	[flat|nested] 16+ messages in thread
end of thread, other threads:[~2013-04-15 16:33 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-15 11:07 [PATCH 1/7] kernel.bbclass: Ensure we have correct version information in deploy data Richard Purdie
2013-04-15 11:07 ` [PATCH] recipes: Fix ALLOW_EMPTY with no package specified Richard Purdie
2013-04-15 11:43   ` Martin Jansa
2013-04-15 12:06     ` Richard Purdie
2013-04-15 11:07 ` [PATCH 2/7] update-alternatives: Ensure DEPENDS is correct in multilib case Richard Purdie
2013-04-15 11:07 ` [PATCH 3/7] ttf-bitstream-vera: Use fontcache class for postinstall Richard Purdie
2013-04-15 11:07 ` [PATCH 4/7] encodings: Set RDEPENDS correctly Richard Purdie
2013-04-15 11:07 ` [PATCH 5/7] qemuwrapper-cross: Inhibit default dependencies Richard Purdie
2013-04-15 11:07 ` [PATCH 6/7] nfs-export-root: Update to use packagegroup naming Richard Purdie
2013-04-15 11:07 ` [PATCH 7/7] allarch: Drop various problematic allarch usages Richard Purdie
2013-04-15 15:16   ` Mark Hatle
2013-04-15 15:40     ` Richard Purdie
2013-04-15 15:49       ` Mark Hatle
2013-04-15 16:15         ` Martin Jansa
2013-04-15 11:38 ` [PATCH 1/7] kernel.bbclass: Ensure we have correct version information in deploy data Martin Jansa
2013-04-15 14:46   ` Richard Purdie

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox