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.

Signed-off-by: Chris Larson <chris_larson@mentor.com>

10 files changed, 1 insertions, 1 deletions

diff --git a/lib/pysh/__init__.py b/lib/bb/pysh/__init__.py
index e69de29bb..e69de29bb 100644
--- a/lib/pysh/__init__.py
+++ b/lib/bb/pysh/__init__.py
diff --git a/lib/pysh/builtin.py b/lib/bb/pysh/builtin.py
index 25ad22eb7..25ad22eb7 100644
--- a/lib/pysh/builtin.py
+++ b/lib/bb/pysh/builtin.py
diff --git a/lib/pysh/interp.py b/lib/bb/pysh/interp.py
index efe5181e1..efe5181e1 100644
--- a/lib/pysh/interp.py
+++ b/lib/bb/pysh/interp.py
diff --git a/lib/pysh/lsprof.py b/lib/bb/pysh/lsprof.py
index b1831c22a..b1831c22a 100644
--- a/lib/pysh/lsprof.py
+++ b/lib/bb/pysh/lsprof.py
diff --git a/lib/pysh/pysh.py b/lib/bb/pysh/pysh.py
index b4e6145b5..b4e6145b5 100644
--- a/lib/pysh/pysh.py
+++ b/lib/bb/pysh/pysh.py
diff --git a/lib/pysh/pyshlex.py b/lib/bb/pysh/pyshlex.py
index b977b5e86..b977b5e86 100644
--- a/lib/pysh/pyshlex.py
+++ b/lib/bb/pysh/pyshlex.py
diff --git a/lib/pysh/pyshyacc.py b/lib/bb/pysh/pyshyacc.py
index 3d9510c0c..3d9510c0c 100644
--- a/lib/pysh/pyshyacc.py
+++ b/lib/bb/pysh/pyshyacc.py
diff --git a/lib/pysh/sherrors.py b/lib/bb/pysh/sherrors.py
index 1d5bd53b3..1d5bd53b3 100644
--- a/lib/pysh/sherrors.py
+++ b/lib/bb/pysh/sherrors.py
diff --git a/lib/pysh/subprocess_fix.py b/lib/bb/pysh/subprocess_fix.py
index 46eca2280..46eca2280 100644
--- a/lib/pysh/subprocess_fix.py
+++ b/lib/bb/pysh/subprocess_fix.py
diff --git a/setup.py b/setup.py
index a8d30ab84..a6679e167 100755
--- a/setup.py
+++ b/setup.py
@@ -54,7 +54,7 @@ setup(name='bitbake',
       requires = ["ply"],
       package_dir = {"": "lib"},
       packages = ["bb.server", "bb.parse.parse_py", "bb.parse", "bb.fetch",
-                  "bb.ui.crumbs", "bb.ui", "bb", "pysh"],
+                  "bb.ui.crumbs", "bb.ui", "bb.pysh", "bb"],
       py_modules = ["codegen"],
       scripts = ["bin/bitbake"],
       data_files = [("share/bitbake", glob("conf/*") + glob("classes/*")),