From 6f97a5881773a20ded15041b36c511881c9bc579 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 27 Oct 2008 18:46:51 +0000 Subject: classes/conf: Handle Distro PR change in sanity.bbclass This patch: * Moves the ABI variables into a new abi_version.conf (like Poky). * Renames SANITY_ABI to OELAYOUT_ABI since it has uses outside sanity.bbclass and sanity.conf. * Adds checks to sanity.bbclass so the user is notified when DISTRO_PR changes in a similar way to the OELAYOUT_ABI versions. --- conf/bitbake.conf | 1 + conf/sanity.conf | 8 +------- 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'conf') diff --git a/conf/bitbake.conf b/conf/bitbake.conf index ab8fa9dcf2..6207e5be50 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -580,6 +580,7 @@ include conf/machine/${MACHINE}.conf include conf/distro/${DISTRO}.conf include conf/documentation.conf require conf/sanity.conf +require conf/abi_version.conf ################################################################## # Weak variables (usually to retain backwards compatibility) diff --git a/conf/sanity.conf b/conf/sanity.conf index e5fe74894d..d6ecfa6765 100644 --- a/conf/sanity.conf +++ b/conf/sanity.conf @@ -5,14 +5,8 @@ # Expert users can confirm their sanity with "touch conf/sanity.conf" 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_PRFILE = "${TMPDIR}/distro_pr" INHERIT += "sanity" -- cgit v1.2.3