summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-12-31 11:00:27 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2011-01-04 14:46:39 +0000
commit4addbd191dec44d01e8d9961e645948c0ebd04c8 (patch)
tree733ca121d5f57fec9634fd047c26749aced188de
parent489d17596d2c532f2d8db3ef8c0f122ca49bb466 (diff)
downloadopenembedded-core-4addbd191dec44d01e8d9961e645948c0ebd04c8.tar.gz
openembedded-core-4addbd191dec44d01e8d9961e645948c0ebd04c8.tar.bz2
openembedded-core-4addbd191dec44d01e8d9961e645948c0ebd04c8.zip
Move the pysh package into the bb package
The pysh we're using is modified, and we don't want to risk it conflicting with one from elsewhere. (Bitbake rev: 1cbf8a9403b4b60d59bfd90a51c3e4246ab834d6) Signed-off-by: Chris Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--bitbake/lib/bb/codeparser.py2
-rw-r--r--bitbake/lib/bb/pysh/__init__.py (renamed from bitbake/lib/pysh/__init__.py)0
-rw-r--r--bitbake/lib/bb/pysh/builtin.py (renamed from bitbake/lib/pysh/builtin.py)0
-rw-r--r--bitbake/lib/bb/pysh/interp.py (renamed from bitbake/lib/pysh/interp.py)0
-rw-r--r--bitbake/lib/bb/pysh/lsprof.py (renamed from bitbake/lib/pysh/lsprof.py)0
-rw-r--r--bitbake/lib/bb/pysh/pysh.py (renamed from bitbake/lib/pysh/pysh.py)0
-rw-r--r--bitbake/lib/bb/pysh/pyshlex.py (renamed from bitbake/lib/pysh/pyshlex.py)0
-rw-r--r--bitbake/lib/bb/pysh/pyshyacc.py (renamed from bitbake/lib/pysh/pyshyacc.py)0
-rw-r--r--bitbake/lib/bb/pysh/sherrors.py (renamed from bitbake/lib/pysh/sherrors.py)0
-rw-r--r--bitbake/lib/bb/pysh/subprocess_fix.py (renamed from bitbake/lib/pysh/subprocess_fix.py)0
10 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/codeparser.py b/bitbake/lib/bb/codeparser.py
index ba3009212b..8b7db934d3 100644
--- a/bitbake/lib/bb/codeparser.py
+++ b/bitbake/lib/bb/codeparser.py
@@ -1,4 +1,4 @@
-from pysh import pyshyacc, pyshlex
+from bb.pysh import pyshyacc, pyshlex
from itertools import chain
from bb import msg, utils
import ast
diff --git a/bitbake/lib/pysh/__init__.py b/bitbake/lib/bb/pysh/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/bitbake/lib/pysh/__init__.py
+++ b/bitbake/lib/bb/pysh/__init__.py
diff --git a/bitbake/lib/pysh/builtin.py b/bitbake/lib/bb/pysh/builtin.py
index 25ad22eb74..25ad22eb74 100644
--- a/bitbake/lib/pysh/builtin.py
+++ b/bitbake/lib/bb/pysh/builtin.py
diff --git a/bitbake/lib/pysh/interp.py b/bitbake/lib/bb/pysh/interp.py
index efe5181e1e..efe5181e1e 100644
--- a/bitbake/lib/pysh/interp.py
+++ b/bitbake/lib/bb/pysh/interp.py
diff --git a/bitbake/lib/pysh/lsprof.py b/bitbake/lib/bb/pysh/lsprof.py
index b1831c22a7..b1831c22a7 100644
--- a/bitbake/lib/pysh/lsprof.py
+++ b/bitbake/lib/bb/pysh/lsprof.py
diff --git a/bitbake/lib/pysh/pysh.py b/bitbake/lib/bb/pysh/pysh.py
index b4e6145b51..b4e6145b51 100644
--- a/bitbake/lib/pysh/pysh.py
+++ b/bitbake/lib/bb/pysh/pysh.py
diff --git a/bitbake/lib/pysh/pyshlex.py b/bitbake/lib/bb/pysh/pyshlex.py
index b977b5e869..b977b5e869 100644
--- a/bitbake/lib/pysh/pyshlex.py
+++ b/bitbake/lib/bb/pysh/pyshlex.py
diff --git a/bitbake/lib/pysh/pyshyacc.py b/bitbake/lib/bb/pysh/pyshyacc.py
index 3d9510c0c3..3d9510c0c3 100644
--- a/bitbake/lib/pysh/pyshyacc.py
+++ b/bitbake/lib/bb/pysh/pyshyacc.py
diff --git a/bitbake/lib/pysh/sherrors.py b/bitbake/lib/bb/pysh/sherrors.py
index 1d5bd53b3a..1d5bd53b3a 100644
--- a/bitbake/lib/pysh/sherrors.py
+++ b/bitbake/lib/bb/pysh/sherrors.py
diff --git a/bitbake/lib/pysh/subprocess_fix.py b/bitbake/lib/bb/pysh/subprocess_fix.py
index 46eca22802..46eca22802 100644
--- a/bitbake/lib/pysh/subprocess_fix.py
+++ b/bitbake/lib/bb/pysh/subprocess_fix.py