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>

diff --git a/lib/pysh/__init__.py b/lib/bb/pysh/__init__.py
similarity index 100%
rename from lib/pysh/__init__.py
rename to lib/bb/pysh/__init__.py

diff --git a/lib/pysh/builtin.py b/lib/bb/pysh/builtin.py
similarity index 100%
rename from lib/pysh/builtin.py
rename to lib/bb/pysh/builtin.py

diff --git a/lib/pysh/interp.py b/lib/bb/pysh/interp.py
similarity index 100%
rename from lib/pysh/interp.py
rename to lib/bb/pysh/interp.py

diff --git a/lib/pysh/lsprof.py b/lib/bb/pysh/lsprof.py
similarity index 100%
rename from lib/pysh/lsprof.py
rename to lib/bb/pysh/lsprof.py

diff --git a/lib/pysh/pysh.py b/lib/bb/pysh/pysh.py
similarity index 100%
rename from lib/pysh/pysh.py
rename to lib/bb/pysh/pysh.py

diff --git a/lib/pysh/pyshlex.py b/lib/bb/pysh/pyshlex.py
similarity index 100%
rename from lib/pysh/pyshlex.py
rename to lib/bb/pysh/pyshlex.py

diff --git a/lib/pysh/pyshyacc.py b/lib/bb/pysh/pyshyacc.py
similarity index 100%
rename from lib/pysh/pyshyacc.py
rename to lib/bb/pysh/pyshyacc.py

diff --git a/lib/pysh/sherrors.py b/lib/bb/pysh/sherrors.py
similarity index 100%
rename from lib/pysh/sherrors.py
rename to lib/bb/pysh/sherrors.py

diff --git a/lib/pysh/subprocess_fix.py b/lib/bb/pysh/subprocess_fix.py
similarity index 100%
rename from lib/pysh/subprocess_fix.py
rename to lib/bb/pysh/subprocess_fix.py

diff --git a/setup.py b/setup.py
index a8d30ab844b6f871a63e5739c558aff9ee31a6da..a6679e16721e7b971564d5e5a5ead11b653205f5 100755 (executable)
--- 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/*")),