summaryrefslogtreecommitdiffstats
path: root/meta-yocto
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2012-04-16 15:52:16 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-16 12:52:26 +0100
commite8ab6ab64b600c9ce550da88cff1868882c7f79d (patch)
tree6879329f714e606862146617c484ac4c76166089 /meta-yocto
parente737d01095a122f483837a99274e932f47747bf7 (diff)
downloadpoky-e8ab6ab64b600c9ce550da88cff1868882c7f79d.tar.gz
poky-e8ab6ab64b600c9ce550da88cff1868882c7f79d.tar.bz2
poky-e8ab6ab64b600c9ce550da88cff1868882c7f79d.zip
meta-yocto: Move OELAYOUT_ABI definition to poky.conf
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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto')
-rw-r--r--meta-yocto/conf/abi_version.conf7
-rw-r--r--meta-yocto/conf/distro/poky.conf7
2 files changed, 7 insertions, 7 deletions
diff --git a/meta-yocto/conf/abi_version.conf b/meta-yocto/conf/abi_version.conf
deleted file mode 100644
index 83b668a2a2..0000000000
--- 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 e4d7c1de91..e51ccdf07d 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"