summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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"