diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes-global/sanity.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes-global/sanity.bbclass b/meta/classes-global/sanity.bbclass index b42fc526c4..c90fc84b76 100644 --- a/meta/classes-global/sanity.bbclass +++ b/meta/classes-global/sanity.bbclass | |||
| @@ -494,7 +494,7 @@ def check_gcc_version(sanity_data): | |||
| 494 | 494 | ||
| 495 | # Tar version 1.24 and onwards handle overwriting symlinks correctly | 495 | # Tar version 1.24 and onwards handle overwriting symlinks correctly |
| 496 | # but earlier versions do not; this needs to work properly for sstate | 496 | # but earlier versions do not; this needs to work properly for sstate |
| 497 | # Version 1.28 is needed so opkg-build works correctly when reproducibile builds are enabled | 497 | # Version 1.28 is needed so opkg-build works correctly when reproducible builds are enabled |
| 498 | def check_tar_version(sanity_data): | 498 | def check_tar_version(sanity_data): |
| 499 | import subprocess | 499 | import subprocess |
| 500 | try: | 500 | try: |
| @@ -622,10 +622,10 @@ def check_sanity_sstate_dir_change(sstate_dir, data): | |||
| 622 | def check_sanity_version_change(status, d): | 622 | def check_sanity_version_change(status, d): |
| 623 | # Sanity checks to be done when SANITY_VERSION or NATIVELSBSTRING changes | 623 | # Sanity checks to be done when SANITY_VERSION or NATIVELSBSTRING changes |
| 624 | # In other words, these tests run once in a given build directory and then | 624 | # In other words, these tests run once in a given build directory and then |
| 625 | # never again until the sanity version or host distrubution id/version changes. | 625 | # never again until the sanity version or host distribution id/version changes. |
| 626 | 626 | ||
| 627 | # Check the python install is complete. Examples that are often removed in | 627 | # Check the python install is complete. Examples that are often removed in |
| 628 | # minimal installations: glib-2.0-natives requries # xml.parsers.expat | 628 | # minimal installations: glib-2.0-natives requires xml.parsers.expat |
| 629 | try: | 629 | try: |
| 630 | import xml.parsers.expat | 630 | import xml.parsers.expat |
| 631 | except ImportError as e: | 631 | except ImportError as e: |
| @@ -682,7 +682,7 @@ def check_sanity_version_change(status, d): | |||
| 682 | if i and workdir.startswith(i): | 682 | if i and workdir.startswith(i): |
| 683 | status.addresult("You are building in a path included in PSEUDO_IGNORE_PATHS " + str(i) + " please locate the build outside this path.\n") | 683 | status.addresult("You are building in a path included in PSEUDO_IGNORE_PATHS " + str(i) + " please locate the build outside this path.\n") |
| 684 | 684 | ||
| 685 | # Check if PSEUDO_IGNORE_PATHS and and paths under pseudo control overlap | 685 | # Check if PSEUDO_IGNORE_PATHS and paths under pseudo control overlap |
| 686 | pseudoignorepaths = d.getVar('PSEUDO_IGNORE_PATHS', expand=True).split(",") | 686 | pseudoignorepaths = d.getVar('PSEUDO_IGNORE_PATHS', expand=True).split(",") |
| 687 | pseudo_control_dir = "${D},${PKGD},${PKGDEST},${IMAGEROOTFS},${SDK_OUTPUT}" | 687 | pseudo_control_dir = "${D},${PKGD},${PKGDEST},${IMAGEROOTFS},${SDK_OUTPUT}" |
| 688 | pseudocontroldir = d.expand(pseudo_control_dir).split(",") | 688 | pseudocontroldir = d.expand(pseudo_control_dir).split(",") |
