summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/sanity.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 208f65ff5a..fcb7846db7 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -59,7 +59,7 @@ def check_sanity(e):
59 conf_version = data.getVar('POKY_CONF_VERSION', e.data, True) 59 conf_version = data.getVar('POKY_CONF_VERSION', e.data, True)
60 60
61 if current_conf != conf_version: 61 if current_conf != conf_version:
62 messages = messages + "Poky has noticed your version of local.conf was generated from an older version of local.conf.sample and there have been updates made to this file. Please compare the two files and merge any changes before continuing.\nMatching the version numbers will remove this message.\n\"meld conf/local.conf conf/local.conf.sample\" is a good way to visualise the changes") 62 messages = messages + "Poky has noticed your version of local.conf was generated from an older version of local.conf.sample and there have been updates made to this file. Please compare the two files and merge any changes before continuing.\nMatching the version numbers will remove this message.\n\"meld conf/local.conf conf/local.conf.sample\" is a good way to visualise the changes"
63 63
64 assume_provided = data.getVar('ASSUME_PROVIDED', e.data , True).split() 64 assume_provided = data.getVar('ASSUME_PROVIDED', e.data , True).split()
65 # Check user doesn't have ASSUME_PROVIDED = instead of += in local.conf 65 # Check user doesn't have ASSUME_PROVIDED = instead of += in local.conf
@@ -174,7 +174,7 @@ def check_sanity(e):
174 f = file(abifile, "w") 174 f = file(abifile, "w")
175 f.write(current_abi) 175 f.write(current_abi)
176 elif abi == "5" and current_abi != "5": 176 elif abi == "5" and current_abi != "5":
177 messages = messages + "Staging layout has changed. The cross directory has been deprecated and cross packages are now built under the native sysroot.\nThis requires a rebuild.\n" 177 messages = messages + "Staging layout has changed. The cross directory has been deprecated and cross packages are now built under the native sysroot.\nThis requires a rebuild.\n"
178 elif (abi != current_abi): 178 elif (abi != current_abi):
179 # Code to convert from one ABI to another could go here if possible. 179 # Code to convert from one ABI to another could go here if possible.
180 messages = messages + "Error, TMPDIR has changed ABI (%s to %s) and you need to either rebuild, revert or adjust it at your own risk.\n" % (abi, current_abi) 180 messages = messages + "Error, TMPDIR has changed ABI (%s to %s) and you need to either rebuild, revert or adjust it at your own risk.\n" % (abi, current_abi)