summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-09 09:33:56 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-09 14:48:23 (GMT)
commite55dc39c3702538ab3d81ff55c37ab7e8c1e78a2 (patch)
treef96f5b108795c3a223525370656b313c3ff3a776 /bitbake
parentc7f76a1bc9868ea4709688967d9794acd4d784ec (diff)
downloadpoky-e55dc39c3702538ab3d81ff55c37ab7e8c1e78a2.tar.gz
Drop psyco support
At best it gave 1-2% improvement now, its 32 bit x86 only and isn't supported after python 2.6. PyPy is probably a better option now. (Bitbake rev: 3c3bd0c2fa80d747f25401c17b785c7c2f3787ca) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rwxr-xr-xbitbake/bin/bitbake3
-rw-r--r--bitbake/doc/bitbake.13
-rw-r--r--bitbake/doc/manual/usermanual.xml2
-rw-r--r--bitbake/lib/bb/cooker.py13
4 files changed, 0 insertions, 21 deletions
diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake
index c348e5e..d6e8e09 100755
--- a/bitbake/bin/bitbake
+++ b/bitbake/bin/bitbake
@@ -139,9 +139,6 @@ Default BBFILES are the .bb files in the current directory.""")
139 parser.add_option("-p", "--parse-only", help = "quit after parsing the BB files (developers only)", 139 parser.add_option("-p", "--parse-only", help = "quit after parsing the BB files (developers only)",
140 action = "store_true", dest = "parse_only", default = False) 140 action = "store_true", dest = "parse_only", default = False)
141 141
142 parser.add_option("-d", "--disable-psyco", help = "disable using the psyco just-in-time compiler (not recommended)",
143 action = "store_true", dest = "disable_psyco", default = False)
144
145 parser.add_option("-s", "--show-versions", help = "show current and preferred versions of all packages", 142 parser.add_option("-s", "--show-versions", help = "show current and preferred versions of all packages",
146 action = "store_true", dest = "show_versions", default = False) 143 action = "store_true", dest = "show_versions", default = False)
147 144
diff --git a/bitbake/doc/bitbake.1 b/bitbake/doc/bitbake.1
index 036402e..aa09620 100644
--- a/bitbake/doc/bitbake.1
+++ b/bitbake/doc/bitbake.1
@@ -85,9 +85,6 @@ don't execute, just go through the motions
85.B \-p, \-\-parse-only 85.B \-p, \-\-parse-only
86quit after parsing the BB files (developers only) 86quit after parsing the BB files (developers only)
87.TP 87.TP
88.B \-d, \-\-disable-psyco
89disable using the psyco just-in-time compiler (not recommended)
90.TP
91.B \-s, \-\-show-versions 88.B \-s, \-\-show-versions
92show current and preferred versions of all packages 89show current and preferred versions of all packages
93.TP 90.TP
diff --git a/bitbake/doc/manual/usermanual.xml b/bitbake/doc/manual/usermanual.xml
index a3e85e1..2ebdf32 100644
--- a/bitbake/doc/manual/usermanual.xml
+++ b/bitbake/doc/manual/usermanual.xml
@@ -417,8 +417,6 @@ options:
417 than once. 417 than once.
418 -n, --dry-run don't execute, just go through the motions 418 -n, --dry-run don't execute, just go through the motions
419 -p, --parse-only quit after parsing the BB files (developers only) 419 -p, --parse-only quit after parsing the BB files (developers only)
420 -d, --disable-psyco disable using the psyco just-in-time compiler (not
421 recommended)
422 -s, --show-versions show current and preferred versions of all packages 420 -s, --show-versions show current and preferred versions of all packages
423 -e, --environment show the global or per-package environment (this is 421 -e, --environment show the global or per-package environment (this is
424 what used to be bbread) 422 what used to be bbread)
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index dc196ae..5bdf90f 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -904,19 +904,6 @@ class BBCooker:
904 if self.state != state.parsing: 904 if self.state != state.parsing:
905 self.parseConfiguration () 905 self.parseConfiguration ()
906 906
907 # Import Psyco if available and not disabled
908 import platform
909 if platform.machine() in ['i386', 'i486', 'i586', 'i686']:
910 if not self.configuration.disable_psyco:
911 try:
912 import psyco
913 except ImportError:
914 collectlog.info("Psyco JIT Compiler (http://psyco.sf.net) not available. Install it to increase performance.")
915 else:
916 psyco.bind( CookerParser.parse_next )
917 else:
918 collectlog.info("You have disabled Psyco. This decreases performance.")
919
920 self.status = bb.cache.CacheData(self.caches_array) 907 self.status = bb.cache.CacheData(self.caches_array)
921 908
922 ignore = bb.data.getVar("ASSUME_PROVIDED", self.configuration.data, 1) or "" 909 ignore = bb.data.getVar("ASSUME_PROVIDED", self.configuration.data, 1) or ""