[oe-commits] Richard Purdie : sanity: Drop pseudo test, now unneeded

git at git.openembedded.org git at git.openembedded.org
Wed Jun 12 12:19:48 UTC 2013


Module: openembedded-core.git
Branch: master-next
Commit: f524e281acfb28aad4cb021fb11961bd19be224a
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=f524e281acfb28aad4cb021fb11961bd19be224a

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Fri Jun  7 18:18:35 2013 +0100

sanity: Drop pseudo test, now unneeded

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/sanity.bbclass |   27 ---------------------------
 1 files changed, 0 insertions(+), 27 deletions(-)

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 8774d66..c4b0ed5 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -204,29 +204,6 @@ def check_sanity_version_change(data):
     # Sanity checks to be done when SANITY_VERSION changes
     return ""
 
-def check_pseudo_wrapper():
-    import sys
-    if not sys.argv[0].endswith('/bitbake'):
-        return ""
-
-    import subprocess as sub
-    # Check if bitbake wrapper is being used
-    pseudo_build = os.environ.get( 'PSEUDO_BUILD' )
-    if not pseudo_build:
-        bb.warn("Bitbake has not been run using the bitbake wrapper (scripts/bitbake); this is likely because your PATH has been altered from that normally set up by the oe-init-build-env script. Not using the wrapper may result in failures during package installation, so it is highly recommended that you set your PATH back so that the wrapper script is being executed.")
-
-    if (not pseudo_build) or pseudo_build == '2':
-        # pseudo ought to be working, let's see if it is...
-        p = sub.Popen(['sh', '-c', 'PSEUDO_DISABLED=0 id -u'],stdout=sub.PIPE,stderr=sub.PIPE)
-        out, err = p.communicate()
-        if out.rstrip() != '0':
-            msg = "Pseudo is not functioning correctly, which will cause failures during package installation. Please check your configuration."
-            if pseudo_build == '2':
-                return msg
-            else:
-                bb.warn(msg)
-    return ""
-
 def check_create_long_filename(filepath, pathname):
     testfile = os.path.join(filepath, ''.join([`num`[-1] for num in xrange(1,200)]))
     try:
@@ -552,10 +529,6 @@ def check_sanity(sanity_data):
         missing = missing.rstrip(',')
         messages = messages + "Please install the following missing utilities: %s\n" % missing
 
-    pseudo_msg = check_pseudo_wrapper()
-    if pseudo_msg != "":
-        messages = messages + pseudo_msg + '\n'
-
     check_supported_distro(sanity_data)
     if machinevalid:
         toolchain_msg = check_toolchain(sanity_data)



More information about the Openembedded-commits mailing list