Patchwork [RFC] bitbake.conf: include machine name in DEPLOY_DIR_IMAGE

login
register
mail settings
Submitter Koen Kooi
Date April 10, 2013, 7:26 a.m.
Message ID <1365578806-1907-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/47813/
State New
Headers show

Comments

Koen Kooi - April 10, 2013, 7:26 a.m.
This allows a clean seperation between all image outputs and making it possible to have convinience symlinks to make it ready to deploy. And while it isn't a valid reason, it must be mentioned: BSP layers which do use convenience symlinks already don't step on files owned by others anymore.

I assumed this was the default behaviour in OE-classic, but as it turns out every DISTRO set it to deploy/images/$MACHINE on its own.

Code inspections shows that the all references to the image deploy dir in classes and scripts in OE-core do the right thing and parse the DEPLOY_DIR_IMAGE variable.

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/conf/bitbake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Richard Purdie - April 10, 2013, 7:44 a.m.
On Wed, 2013-04-10 at 09:26 +0200, Koen Kooi wrote:
> This allows a clean seperation between all image outputs and making it
> possible to have convinience symlinks to make it ready to deploy. And
> while it isn't a valid reason, it must be mentioned: BSP layers which
> do use convenience symlinks already don't step on files owned by
> others anymore.
>
> I assumed this was the default behaviour in OE-classic, but as it
> turns out every DISTRO set it to deploy/images/$MACHINE on its own.
> 
> Code inspections shows that the all references to the image deploy dir
> in classes and scripts in OE-core do the right thing and parse the
> DEPLOY_DIR_IMAGE variable.
> 
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
>  meta/conf/bitbake.conf | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

I'm pretty sure someone proposed something like this (relocating output)
just before danny. Changing something like this just before release is a
*really* bad idea. It breaks the docs and the assumptions the
autobuilder and several scripts (e.g. runqemu and the qemuimage testing)
make about where output ends up.

So as I said last time, if we want to do something like this, lets do it
at the start of development of a release, not the end.

Cheers,

Richard
Koen Kooi - April 10, 2013, 8:05 a.m.
Op 10 apr. 2013, om 09:44 heeft Richard Purdie <richard.purdie@linuxfoundation.org> het volgende geschreven:

> On Wed, 2013-04-10 at 09:26 +0200, Koen Kooi wrote:
>> This allows a clean seperation between all image outputs and making it
>> possible to have convinience symlinks to make it ready to deploy. And
>> while it isn't a valid reason, it must be mentioned: BSP layers which
>> do use convenience symlinks already don't step on files owned by
>> others anymore.
>> 
>> I assumed this was the default behaviour in OE-classic, but as it
>> turns out every DISTRO set it to deploy/images/$MACHINE on its own.
>> 
>> Code inspections shows that the all references to the image deploy dir
>> in classes and scripts in OE-core do the right thing and parse the
>> DEPLOY_DIR_IMAGE variable.
>> 
>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
>> ---
>> meta/conf/bitbake.conf | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> I'm pretty sure someone proposed something like this (relocating output)
> just before danny. Changing something like this just before release is a
> *really* bad idea. It breaks the docs and the assumptions the
> autobuilder and several scripts (e.g. runqemu and the qemuimage testing)
> make about where output ends up.

It is weird that runqemu gets some vars from bitbake -e, and others from hardcoding them. v2 should address that.

> So as I said last time, if we want to do something like this, lets do it
> at the start of development of a release, not the end.

I sent it to be in time for the start of the new release :) It sure wasn't meant to go into 1.4. 

regards,

Koen
Martin Jansa - April 10, 2013, 8:29 a.m.
On Wed, Apr 10, 2013 at 09:26:46AM +0200, Koen Kooi wrote:
> This allows a clean seperation between all image outputs and making it possible to have convinience symlinks to make it ready to deploy. And while it isn't a valid reason, it must be mentioned: BSP layers which do use convenience symlinks already don't step on files owned by others anymore.
> 
> I assumed this was the default behaviour in OE-classic, but as it turns out every DISTRO set it to deploy/images/$MACHINE on its own.
> 
> Code inspections shows that the all references to the image deploy dir in classes and scripts in OE-core do the right thing and parse the DEPLOY_DIR_IMAGE variable.
> 

AFAIK we also deploy only MACHINE_ARCH images, so it nicely indicates
that (like deploy/<pkg>/MACHINE_ARCH).

Acked-by: Martin Jansa <Martin.Jansa@gmail.com>

> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
>  meta/conf/bitbake.conf | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index cd5d61e..0540766 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -379,7 +379,7 @@ DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar"
>  DEPLOY_DIR_IPK = "${DEPLOY_DIR}/ipk"
>  DEPLOY_DIR_RPM = "${DEPLOY_DIR}/rpm"
>  DEPLOY_DIR_DEB = "${DEPLOY_DIR}/deb"
> -DEPLOY_DIR_IMAGE ?= "${DEPLOY_DIR}/images"
> +DEPLOY_DIR_IMAGE ?= "${DEPLOY_DIR}/images/${MACHINE}"
>  DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools"
>  
>  PKGDATA_DIR = "${TMPDIR}/pkgdata/${MULTIMACH_TARGET_SYS}"
> -- 
> 1.8.1.4
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index cd5d61e..0540766 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -379,7 +379,7 @@  DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar"
 DEPLOY_DIR_IPK = "${DEPLOY_DIR}/ipk"
 DEPLOY_DIR_RPM = "${DEPLOY_DIR}/rpm"
 DEPLOY_DIR_DEB = "${DEPLOY_DIR}/deb"
-DEPLOY_DIR_IMAGE ?= "${DEPLOY_DIR}/images"
+DEPLOY_DIR_IMAGE ?= "${DEPLOY_DIR}/images/${MACHINE}"
 DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools"
 
 PKGDATA_DIR = "${TMPDIR}/pkgdata/${MULTIMACH_TARGET_SYS}"