summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-07 18:18:35 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-14 12:53:52 +0100
commit2cc601cd266959cb7e9726cc5946dc2a49953b16 (patch)
tree6709c655dd072edbbb0013213a7aaec2d185e717 /meta/classes
parentbd07f35bdb9423440da367690efba1131aa51b4e (diff)
downloadpoky-2cc601cd266959cb7e9726cc5946dc2a49953b16.tar.gz
sanity: Drop pseudo test, now unneeded
(From OE-Core rev: 075278db6f7a4783c952c72eebddf51a12f76075) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/sanity.bbclass27
1 files changed, 0 insertions, 27 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 9a29f328f6..0eb6ae334b 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -204,29 +204,6 @@ def check_sanity_version_change(data):
204 # Sanity checks to be done when SANITY_VERSION changes 204 # Sanity checks to be done when SANITY_VERSION changes
205 return "" 205 return ""
206 206
207def check_pseudo_wrapper():
208 import sys
209 if not sys.argv[0].endswith('/bitbake'):
210 return ""
211
212 import subprocess as sub
213 # Check if bitbake wrapper is being used
214 pseudo_build = os.environ.get( 'PSEUDO_BUILD' )
215 if not pseudo_build:
216 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.")
217
218 if (not pseudo_build) or pseudo_build == '2':
219 # pseudo ought to be working, let's see if it is...
220 p = sub.Popen(['sh', '-c', 'PSEUDO_DISABLED=0 id -u'],stdout=sub.PIPE,stderr=sub.PIPE)
221 out, err = p.communicate()
222 if out.rstrip() != '0':
223 msg = "Pseudo is not functioning correctly, which will cause failures during package installation. Please check your configuration."
224 if pseudo_build == '2':
225 return msg
226 else:
227 bb.warn(msg)
228 return ""
229
230def check_create_long_filename(filepath, pathname): 207def check_create_long_filename(filepath, pathname):
231 testfile = os.path.join(filepath, ''.join([`num`[-1] for num in xrange(1,200)])) 208 testfile = os.path.join(filepath, ''.join([`num`[-1] for num in xrange(1,200)]))
232 try: 209 try:
@@ -551,10 +528,6 @@ def check_sanity(sanity_data):
551 missing = missing.rstrip(',') 528 missing = missing.rstrip(',')
552 messages = messages + "Please install the following missing utilities: %s\n" % missing 529 messages = messages + "Please install the following missing utilities: %s\n" % missing
553 530
554 pseudo_msg = check_pseudo_wrapper()
555 if pseudo_msg != "":
556 messages = messages + pseudo_msg + '\n'
557
558 check_supported_distro(sanity_data) 531 check_supported_distro(sanity_data)
559 if machinevalid: 532 if machinevalid:
560 toolchain_msg = check_toolchain(sanity_data) 533 toolchain_msg = check_toolchain(sanity_data)