Move SANITY_ABI to its own file and give a more general name
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4938 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
parent
09d8aa054f
commit
8beb43ca48
|
@ -141,7 +141,7 @@ def check_sanity(e):
|
||||||
#
|
#
|
||||||
# Check the 'ABI' of TMPDIR
|
# Check the 'ABI' of TMPDIR
|
||||||
#
|
#
|
||||||
current_abi = data.getVar('SANITY_ABI', e.data, True)
|
current_abi = data.getVar('OELAYOUT_ABI', e.data, True)
|
||||||
abifile = data.getVar('SANITY_ABIFILE', e.data, True)
|
abifile = data.getVar('SANITY_ABIFILE', e.data, True)
|
||||||
if os.path.exists(abifile):
|
if os.path.exists(abifile):
|
||||||
f = file(abifile, "r")
|
f = file(abifile, "r")
|
||||||
|
|
|
@ -0,0 +1,7 @@
|
||||||
|
#
|
||||||
|
# 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 = "2"
|
|
@ -576,6 +576,7 @@ include conf/machine/${MACHINE}.conf
|
||||||
include conf/distro/${DISTRO}.conf
|
include conf/distro/${DISTRO}.conf
|
||||||
include conf/documentation.conf
|
include conf/documentation.conf
|
||||||
require conf/sanity.conf
|
require conf/sanity.conf
|
||||||
|
require conf/abi_version.conf
|
||||||
|
|
||||||
##################################################################
|
##################################################################
|
||||||
# Weak variables (usually to retain backwards compatibility)
|
# Weak variables (usually to retain backwards compatibility)
|
||||||
|
|
|
@ -5,13 +5,6 @@
|
||||||
# Expert users can confirm their sanity with "touch conf/sanity.conf"
|
# Expert users can confirm their sanity with "touch conf/sanity.conf"
|
||||||
BB_MIN_VERSION = "1.8.10"
|
BB_MIN_VERSION = "1.8.10"
|
||||||
|
|
||||||
#
|
|
||||||
# SANITY_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.
|
|
||||||
#
|
|
||||||
SANITY_ABI = "2"
|
|
||||||
SANITY_ABIFILE = "${TMPDIR}/abi_version"
|
SANITY_ABIFILE = "${TMPDIR}/abi_version"
|
||||||
|
|
||||||
INHERIT += "sanity"
|
INHERIT += "sanity"
|
||||||
|
|
Loading…
Reference in New Issue