summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2020-03-19 20:19:13 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-03-30 17:41:56 +0100
commit4ccd0345c82f396921b21df491d0ade2ad36089f (patch)
treed936179eecc95bd8b879b6a1ea492b4e42301a52 /meta
parentbf506f4eba1b7766ffc38656f3107a130a427152 (diff)
downloadpoky-4ccd0345c82f396921b21df491d0ade2ad36089f.tar.gz
sanity: check for more bits of Python
MJ: icu in master doesn't need distutils anymore, because icu 65.1 currently in dunfell/master doesn't depend on python3-distutils anymore since: https://github.com/unicode-org/icu/commit/b4d41b0561b6e8de38b99850ce0e4be8ef536bb1 but the icu-64.2 in zeus and openembedded-core/meta/recipes-core/ovmf/ovmf_git.bb still need python3-distutils as described in: http://lists.openembedded.org/pipermail/openembedded-core/2020-March/293984.html (From OE-Core rev: da2df0251098c46a1476983db379cf33010e3035) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/sanity.bbclass12
1 files changed, 7 insertions, 5 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 936fe913b4..5c2f8f9d75 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -625,13 +625,14 @@ def check_sanity_version_change(status, d):
625 # In other words, these tests run once in a given build directory and then 625 # In other words, these tests run once in a given build directory and then
626 # never again until the sanity version or host distrubution id/version changes. 626 # never again until the sanity version or host distrubution id/version changes.
627 627
628 # Check the python install is complete. glib-2.0-natives requries 628 # Check the python install is complete. Examples that are often removed in
629 # xml.parsers.expat 629 # minimal installations: glib-2.0-natives requries # xml.parsers.expat and icu
630 # requires distutils.sysconfig.
630 try: 631 try:
631 import xml.parsers.expat 632 import xml.parsers.expat
632 except ImportError: 633 import distutils.sysconfig
633 status.addresult('Your python is not a full install. Please install the module xml.parsers.expat (python-xml on openSUSE and SUSE Linux).\n') 634 except ImportError as e:
634 import stat 635 status.addresult('Your Python 3 is not a full install. Please install the module %s (see the Getting Started guide for further information).\n' % e.name)
635 636
636 status.addresult(check_make_version(d)) 637 status.addresult(check_make_version(d))
637 status.addresult(check_patch_version(d)) 638 status.addresult(check_patch_version(d))
@@ -667,6 +668,7 @@ def check_sanity_version_change(status, d):
667 status.addresult('Please use ASSUME_PROVIDED +=, not ASSUME_PROVIDED = in your local.conf\n') 668 status.addresult('Please use ASSUME_PROVIDED +=, not ASSUME_PROVIDED = in your local.conf\n')
668 669
669 # Check that TMPDIR isn't on a filesystem with limited filename length (eg. eCryptFS) 670 # Check that TMPDIR isn't on a filesystem with limited filename length (eg. eCryptFS)
671 import stat
670 tmpdir = d.getVar('TMPDIR') 672 tmpdir = d.getVar('TMPDIR')
671 status.addresult(check_create_long_filename(tmpdir, "TMPDIR")) 673 status.addresult(check_create_long_filename(tmpdir, "TMPDIR"))
672 tmpdirmode = os.stat(tmpdir).st_mode 674 tmpdirmode = os.stat(tmpdir).st_mode