[PATCH 0/1][PULL] meta-yocto: Move OELAYOUT_ABI definition to poky.conf

[PATCH 0/1][PULL] meta-yocto: Move OELAYOUT_ABI definition to poky.conf

[Dongxiao Xu]

Hi Richard,

This pull request contains a commit that moves the OELAYOUT_ABI definition from abi_version.conf
to poky.conf, which could fix [YOCTO #2303].

This pull request does depend on another pull request (bitbake.conf: Include abi_version.conf in earlier stage) that I sent in oe-core mailing list.

Please help to review and pull.

Thanks,
Dongxiao

The following changes since commit 2ddf7d3e8326e8cb07101ddb2d6e5dc6866371e2:

  gcc-configure-common.inc: Stop gcc looking at build system paths (2012-04-15 18:09:57 +0100)

are available in the git repository at:
  git://git.pokylinux.org/poky-contrib dxu4/hob-bugfix-yocto
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/hob-bugfix-yocto

Dongxiao Xu (1):
  meta-yocto: Move OELAYOUT_ABI definition to poky.conf

 meta-yocto/conf/abi_version.conf |    7 -------
 meta-yocto/conf/distro/poky.conf |    7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 meta-yocto/conf/abi_version.conf

-- 
1.7.4.1

[PATCH 1/1] meta-yocto: Move OELAYOUT_ABI definition to poky.conf

[Dongxiao Xu]

The ABI version definition should go along with the DISTRO variable
since it impact the TMPDIR definition.

Otherwise, if a user used to work with pure OE-Core, and then he/she
added meta-yocto layer, it will report ABI version incompatibility
issue. This is because ABI is changed to "8" by adding meta-yocto layer,
however the DISTRO variable is not defined and TMPDIR is still
"tmp-eglibc".

Defining the OELAYOUT_ABI variable in poky.conf could fix this issue.

This fixes [YOCTO #2303]

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
 meta-yocto/conf/abi_version.conf |    7 -------
 meta-yocto/conf/distro/poky.conf |    7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 meta-yocto/conf/abi_version.conf

diff --git a/meta-yocto/conf/abi_version.conf b/meta-yocto/conf/abi_version.conf
deleted file mode 100644
index 83b668a..0000000
--- a/meta-yocto/conf/abi_version.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# OELAYOUT_ABI allows us to notify users when the format of TMPDIR changes in 
-# an incompatible way. Such changes should usually be detailed in the commit
-# that breaks the format and have been previously discussed on the mailing list 
-# with general agreement from the core team.
-#
-OELAYOUT_ABI = "8"
diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf
index e4d7c1d..e51ccdf 100644
--- a/meta-yocto/conf/distro/poky.conf
+++ b/meta-yocto/conf/distro/poky.conf
@@ -67,3 +67,10 @@ CONNECTIVITY_CHECK_URIS ?= "git://git.yoctoproject.org/yocto-firewall-test;proto
 
 # Default hash policy for distro
 BB_SIGNATURE_HANDLER ?= 'OEBasicHash'
+#
+# OELAYOUT_ABI allows us to notify users when the format of TMPDIR changes in 
+# an incompatible way. Such changes should usually be detailed in the commit
+# that breaks the format and have been previously discussed on the mailing list 
+# with general agreement from the core team.
+#
+OELAYOUT_ABI = "8"
-- 
1.7.4.1

Re: [PATCH 0/1][PULL] meta-yocto: Move OELAYOUT_ABI definition to poky.conf

[Saul Wold]

On 04/16/2012 12:52 AM, Dongxiao Xu wrote:
> Hi Richard,
>
> This pull request contains a commit that moves the OELAYOUT_ABI definition from abi_version.conf
> to poky.conf, which could fix [YOCTO #2303].
>
> This pull request does depend on another pull request (bitbake.conf: Include abi_version.conf in earlier stage) that I sent in oe-core mailing list.
>
> Please help to review and pull.
>
> Thanks,
> Dongxiao
>
> The following changes since commit 2ddf7d3e8326e8cb07101ddb2d6e5dc6866371e2:
>
>    gcc-configure-common.inc: Stop gcc looking at build system paths (2012-04-15 18:09:57 +0100)
>
> are available in the git repository at:
>    git://git.pokylinux.org/poky-contrib dxu4/hob-bugfix-yocto
>    http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/hob-bugfix-yocto
>
> Dongxiao Xu (1):
>    meta-yocto: Move OELAYOUT_ABI definition to poky.conf
>
>   meta-yocto/conf/abi_version.conf |    7 -------
>   meta-yocto/conf/distro/poky.conf |    7 +++++++
>   2 files changed, 7 insertions(+), 7 deletions(-)
>   delete mode 100644 meta-yocto/conf/abi_version.conf
>

Merged into Poky Master

Thanks
	Sau!

Re: [PATCH 1/1] meta-yocto: Move OELAYOUT_ABI definition to poky.conf

[Bob Cochran]

On 04/16/2012 03:52 AM, Dongxiao Xu wrote:
> The ABI version definition should go along with the DISTRO variable
> since it impact the TMPDIR definition.
>
> Otherwise, if a user used to work with pure OE-Core, and then he/she
> added meta-yocto layer, it will report ABI version incompatibility
> issue. This is because ABI is changed to "8" by adding meta-yocto layer,
> however the DISTRO variable is not defined and TMPDIR is still
> "tmp-eglibc".

I'm having trouble understanding what was accomplished with these 
changes and the motivation for them.  Didn't poky do it's job of 
complaining when the user first built without the meta-yocto layer and 
then added it back in, which caused OELAYOUT_ABI to change?

Before and after the change, OELAYOUT_ABI="8" was defined in 
meta-yocto/conf.  The setting of the variable was only moved between 
files in this layer (abi_version.conf to poky.conf).    Regardless, 
neither of these files are going to be found by the "include" inside 
bitbake.conf once meta-yocto is removed from BBPATH.

When OELAYOUT_ABI was previously set in abi_version.conf, poky depended 
on meta-yocto being in front of meta in BBPATH for the variable to be 
picked up correctly, so it seems that moving the variable to poky.conf 
and reordering the includes / requires in bitbake.conf removes the path 
dependency, but I don't see this motivation anywhere in the commit 
comments.

I'm certainly not a seasoned poky user, but it seems to me that this 
change isn't explained well.


>
> Defining the OELAYOUT_ABI variable in poky.conf could fix this issue.
>
> This fixes [YOCTO #2303]


Going into the bug description, it is stated in item #5 that the 
meta-yocto layer was added back in, but it doesn't state whether DISTRO 
was set again in local.conf to poky.  I'm thinking that was part of the 
test procedure, but left out?

Any clarifications would be greatly appreciated.  Thanks!



>
> Signed-off-by: Dongxiao Xu<dongxiao.xu@intel.com>
> ---
>   meta-yocto/conf/abi_version.conf |    7 -------
>   meta-yocto/conf/distro/poky.conf |    7 +++++++
>   2 files changed, 7 insertions(+), 7 deletions(-)
>   delete mode 100644 meta-yocto/conf/abi_version.conf
>
> diff --git a/meta-yocto/conf/abi_version.conf b/meta-yocto/conf/abi_version.conf
> deleted file mode 100644
> index 83b668a..0000000
> --- a/meta-yocto/conf/abi_version.conf
> +++ /dev/null
> @@ -1,7 +0,0 @@
> -#
> -# OELAYOUT_ABI allows us to notify users when the format of TMPDIR changes in
> -# an incompatible way. Such changes should usually be detailed in the commit
> -# that breaks the format and have been previously discussed on the mailing list
> -# with general agreement from the core team.
> -#
> -OELAYOUT_ABI = "8"
> diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf
> index e4d7c1d..e51ccdf 100644
> --- a/meta-yocto/conf/distro/poky.conf
> +++ b/meta-yocto/conf/distro/poky.conf
> @@ -67,3 +67,10 @@ CONNECTIVITY_CHECK_URIS ?= "git://git.yoctoproject.org/yocto-firewall-test;proto
>
>   # Default hash policy for distro
>   BB_SIGNATURE_HANDLER ?= 'OEBasicHash'
> +#
> +# OELAYOUT_ABI allows us to notify users when the format of TMPDIR changes in
> +# an incompatible way. Such changes should usually be detailed in the commit
> +# that breaks the format and have been previously discussed on the mailing list
> +# with general agreement from the core team.
> +#
> +OELAYOUT_ABI = "8"

Re: [PATCH 1/1] meta-yocto: Move OELAYOUT_ABI definition to poky.conf

[Richard Purdie]

On Mon, 2012-04-16 at 12:26 -0400, Bob Cochran wrote:
> On 04/16/2012 03:52 AM, Dongxiao Xu wrote:
> > The ABI version definition should go along with the DISTRO variable
> > since it impact the TMPDIR definition.
> >
> > Otherwise, if a user used to work with pure OE-Core, and then he/she
> > added meta-yocto layer, it will report ABI version incompatibility
> > issue. This is because ABI is changed to "8" by adding meta-yocto layer,
> > however the DISTRO variable is not defined and TMPDIR is still
> > "tmp-eglibc".
> 
> I'm having trouble understanding what was accomplished with these 
> changes and the motivation for them.  Didn't poky do it's job of 
> complaining when the user first built without the meta-yocto layer and 
> then added it back in, which caused OELAYOUT_ABI to change?
> 
> Before and after the change, OELAYOUT_ABI="8" was defined in 
> meta-yocto/conf.  The setting of the variable was only moved between 
> files in this layer (abi_version.conf to poky.conf).    Regardless, 
> neither of these files are going to be found by the "include" inside 
> bitbake.conf once meta-yocto is removed from BBPATH.
> 
> When OELAYOUT_ABI was previously set in abi_version.conf, poky depended 
> on meta-yocto being in front of meta in BBPATH for the variable to be 
> picked up correctly, so it seems that moving the variable to poky.conf 
> and reordering the includes / requires in bitbake.conf removes the path 
> dependency, but I don't see this motivation anywhere in the commit 
> comments.
> 
> I'm certainly not a seasoned poky user, but it seems to me that this 
> change isn't explained well.
> 
> 
> >
> > Defining the OELAYOUT_ABI variable in poky.conf could fix this issue.
> >
> > This fixes [YOCTO #2303]
> 
> 
> Going into the bug description, it is stated in item #5 that the 
> meta-yocto layer was added back in, but it doesn't state whether DISTRO 
> was set again in local.conf to poky.  I'm thinking that was part of the 
> test procedure, but left out?
> 
> Any clarifications would be greatly appreciated.  Thanks!


The issue was that you could add the meta-yocto layer without setting
DISTRO="poky" but instead leave DISTRO unset. This would leave things in
an inconsistent state.

The change moves OELAYOUT_ABI alongside the change that uses it and
hence makes things consistent.

Cheers,

Richard