[OE-core] [PATCH 1/7] kernel.bbclass: Ensure we have correct version information in deploy data

[Martin Jansa]

On Mon, Apr 15, 2013 at 12:07:01PM +0100, Richard Purdie wrote:
> Currently the names used for the kernel in deploy will contain "AUTOREV"

Here it shows "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.
> 
> Signed-off-by: Richard Purdie <richard.purdie at 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
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20130415/4e785c33/attachment-0002.sig>