diff options
-rw-r--r-- | meta/classes/sanity.bbclass | 3 | ||||
-rw-r--r-- | meta/conf/abi_version.conf | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 0eee89d71c..3262d08fbf 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass | |||
@@ -619,6 +619,9 @@ def sanity_handle_abichanges(status, d): | |||
619 | f.write(current_abi) | 619 | f.write(current_abi) |
620 | elif int(abi) <= 11 and current_abi == "12": | 620 | elif int(abi) <= 11 and current_abi == "12": |
621 | status.addresult("The layout of TMPDIR changed for Recipe Specific Sysroots.\nConversion doesn't make sense and this change will rebuild everything so please delete TMPDIR (%s).\n" % d.getVar("TMPDIR")) | 621 | status.addresult("The layout of TMPDIR changed for Recipe Specific Sysroots.\nConversion doesn't make sense and this change will rebuild everything so please delete TMPDIR (%s).\n" % d.getVar("TMPDIR")) |
622 | elif int(abi) <= 13 and current_abi == "14": | ||
623 | status.addresult("TMPDIR changed to include path filtering from the pseudo database.\nIt is recommended to use a clean TMPDIR with the new pseudo path filtering so TMPDIR (%s) would need to be removed to continue.\n" % d.getVar("TMPDIR")) | ||
624 | |||
622 | elif (abi != current_abi): | 625 | elif (abi != current_abi): |
623 | # Code to convert from one ABI to another could go here if possible. | 626 | # Code to convert from one ABI to another could go here if possible. |
624 | status.addresult("Error, TMPDIR has changed its layout version number (%s to %s) and you need to either rebuild, revert or adjust it at your own risk.\n" % (abi, current_abi)) | 627 | status.addresult("Error, TMPDIR has changed its layout version number (%s to %s) and you need to either rebuild, revert or adjust it at your own risk.\n" % (abi, current_abi)) |
diff --git a/meta/conf/abi_version.conf b/meta/conf/abi_version.conf index e04343b47c..5318a10190 100644 --- a/meta/conf/abi_version.conf +++ b/meta/conf/abi_version.conf | |||
@@ -4,7 +4,7 @@ | |||
4 | # that breaks the format and have been previously discussed on the mailing list | 4 | # that breaks the format and have been previously discussed on the mailing list |
5 | # with general agreement from the core team. | 5 | # with general agreement from the core team. |
6 | # | 6 | # |
7 | OELAYOUT_ABI = "12" | 7 | OELAYOUT_ABI = "14" |
8 | 8 | ||
9 | # | 9 | # |
10 | # HASHEQUIV_HASH_VERSION is injected into the output hash calculation used by | 10 | # HASHEQUIV_HASH_VERSION is injected into the output hash calculation used by |