[dylan][PATCH] kernel.bbclass: Complete fix for modules symlink

[dylan][PATCH] kernel.bbclass: Complete fix for modules symlink

[Paul Barker]

From: Paul Barker <paul.barker@commagility.com>

The fix backported in commit aa9fc551 of oe-core does not completely fix the
issue (Yocto #4595) as intended. The modules symlink is still created in the
working directory instead of in the deploy directory. To fix this, we just need
to use an absolute path to ${DEPLOYDIR} when creating the symlink.

Signed-off-by: Paul Barker <paul.barker@commagility.com>
---
 meta/classes/kernel.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 324e812..67b662a 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -372,7 +372,7 @@ kernel_do_deploy() {
 	if [ ${MODULE_TARBALL_DEPLOY} = "1" ] && (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
 		mkdir -p ${D}/lib
 		tar -cvzf ${DEPLOYDIR}/${MODULE_TARBALL_BASE_NAME} -C ${D} lib
-		ln -sf ${MODULE_TARBALL_BASE_NAME} ${MODULE_TARBALL_SYMLINK_NAME}
+		ln -sf ${MODULE_TARBALL_BASE_NAME} ${DEPLOYDIR}/${MODULE_TARBALL_SYMLINK_NAME}
 	fi
 
 	cd ${DEPLOYDIR}
-- 
1.9.1

Re: [dylan][PATCH] kernel.bbclass: Complete fix for modules symlink

[Paul Barker]

[-- Attachment #1: Type: text/plain, Size: 874 bytes --]

On Tue, May 05, 2015 at 06:33:01PM +0100, Paul Barker wrote:
> From: Paul Barker <paul.barker@commagility.com>
> 
> The fix backported in commit aa9fc551 of oe-core does not completely fix the
> issue (Yocto #4595) as intended. The modules symlink is still created in the
> working directory instead of in the deploy directory. To fix this, we just need
> to use an absolute path to ${DEPLOYDIR} when creating the symlink.
> 
> Signed-off-by: Paul Barker <paul.barker@commagility.com>

This is a follow-up to my backport request in January, sorry it's took ages to
get this one out. I've had to forward the email from my personal account as the
email system at work would munch the patch.

This has been tested on our autobuilder and looks to be working as expected.

Thanks,

-- 
Paul Barker

Email: paul@paulbarker.me.uk
http://www.paulbarker.me.uk

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 501 bytes --]

Re: [dylan][PATCH] kernel.bbclass: Complete fix for modules symlink

[Paul Barker]

[-- Attachment #1: Type: text/plain, Size: 1399 bytes --]

On Tue, May 05, 2015 at 06:33:01PM +0100, Paul Barker wrote:
> From: Paul Barker <paul.barker@commagility.com>
> 
> The fix backported in commit aa9fc551 of oe-core does not completely fix the
> issue (Yocto #4595) as intended. The modules symlink is still created in the
> working directory instead of in the deploy directory. To fix this, we just need
> to use an absolute path to ${DEPLOYDIR} when creating the symlink.
> 
> Signed-off-by: Paul Barker <paul.barker@commagility.com>
> ---
>  meta/classes/kernel.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> index 324e812..67b662a 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -372,7 +372,7 @@ kernel_do_deploy() {
>  	if [ ${MODULE_TARBALL_DEPLOY} = "1" ] && (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
>  		mkdir -p ${D}/lib
>  		tar -cvzf ${DEPLOYDIR}/${MODULE_TARBALL_BASE_NAME} -C ${D} lib
> -		ln -sf ${MODULE_TARBALL_BASE_NAME} ${MODULE_TARBALL_SYMLINK_NAME}
> +		ln -sf ${MODULE_TARBALL_BASE_NAME} ${DEPLOYDIR}/${MODULE_TARBALL_SYMLINK_NAME}
>  	fi
>  
>  	cd ${DEPLOYDIR}
> -- 
> 1.9.1
> 

Ping on this patch.

I know it's for dylan but sadly we're stuck with it for now.

Thanks,

-- 
Paul Barker

Email: paul@paulbarker.me.uk
http://www.paulbarker.me.uk

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 501 bytes --]