From 4addbd191dec44d01e8d9961e645948c0ebd04c8 Mon Sep 17 00:00:00 2001
From: Chris Larson <chris_larson@mentor.com>
Date: Fri, 31 Dec 2010 11:00:27 +0000
Subject: [PATCH] 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>
---
 bitbake/lib/bb/codeparser.py                | 2 +-
 bitbake/lib/{ => bb}/pysh/__init__.py       | 0
 bitbake/lib/{ => bb}/pysh/builtin.py        | 0
 bitbake/lib/{ => bb}/pysh/interp.py         | 0
 bitbake/lib/{ => bb}/pysh/lsprof.py         | 0
 bitbake/lib/{ => bb}/pysh/pysh.py           | 0
 bitbake/lib/{ => bb}/pysh/pyshlex.py        | 0
 bitbake/lib/{ => bb}/pysh/pyshyacc.py       | 0
 bitbake/lib/{ => bb}/pysh/sherrors.py       | 0
 bitbake/lib/{ => bb}/pysh/subprocess_fix.py | 0
 10 files changed, 1 insertion(+), 1 deletion(-)
 rename bitbake/lib/{ => bb}/pysh/__init__.py (100%)
 rename bitbake/lib/{ => bb}/pysh/builtin.py (100%)
 rename bitbake/lib/{ => bb}/pysh/interp.py (100%)
 rename bitbake/lib/{ => bb}/pysh/lsprof.py (100%)
 rename bitbake/lib/{ => bb}/pysh/pysh.py (100%)
 rename bitbake/lib/{ => bb}/pysh/pyshlex.py (100%)
 rename bitbake/lib/{ => bb}/pysh/pyshyacc.py (100%)
 rename bitbake/lib/{ => bb}/pysh/sherrors.py (100%)
 rename bitbake/lib/{ => bb}/pysh/subprocess_fix.py (100%)

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
similarity index 100%
rename from bitbake/lib/pysh/__init__.py
rename to bitbake/lib/bb/pysh/__init__.py
diff --git a/bitbake/lib/pysh/builtin.py b/bitbake/lib/bb/pysh/builtin.py
similarity index 100%
rename from bitbake/lib/pysh/builtin.py
rename to bitbake/lib/bb/pysh/builtin.py
diff --git a/bitbake/lib/pysh/interp.py b/bitbake/lib/bb/pysh/interp.py
similarity index 100%
rename from bitbake/lib/pysh/interp.py
rename to bitbake/lib/bb/pysh/interp.py
diff --git a/bitbake/lib/pysh/lsprof.py b/bitbake/lib/bb/pysh/lsprof.py
similarity index 100%
rename from bitbake/lib/pysh/lsprof.py
rename to bitbake/lib/bb/pysh/lsprof.py
diff --git a/bitbake/lib/pysh/pysh.py b/bitbake/lib/bb/pysh/pysh.py
similarity index 100%
rename from bitbake/lib/pysh/pysh.py
rename to bitbake/lib/bb/pysh/pysh.py
diff --git a/bitbake/lib/pysh/pyshlex.py b/bitbake/lib/bb/pysh/pyshlex.py
similarity index 100%
rename from bitbake/lib/pysh/pyshlex.py
rename to bitbake/lib/bb/pysh/pyshlex.py
diff --git a/bitbake/lib/pysh/pyshyacc.py b/bitbake/lib/bb/pysh/pyshyacc.py
similarity index 100%
rename from bitbake/lib/pysh/pyshyacc.py
rename to bitbake/lib/bb/pysh/pyshyacc.py
diff --git a/bitbake/lib/pysh/sherrors.py b/bitbake/lib/bb/pysh/sherrors.py
similarity index 100%
rename from bitbake/lib/pysh/sherrors.py
rename to bitbake/lib/bb/pysh/sherrors.py
diff --git a/bitbake/lib/pysh/subprocess_fix.py b/bitbake/lib/bb/pysh/subprocess_fix.py
similarity index 100%
rename from bitbake/lib/pysh/subprocess_fix.py
rename to bitbake/lib/bb/pysh/subprocess_fix.py
-- 
2.40.1