bitbake: Sync with upstream after 2.8.12 release

4 files changed, 6 insertions, 2 deletions

diff --git a/bitbake/ChangeLog b/bitbake/ChangeLog
index a053ab839e..9fe3bf3d83 100644
--- a/bitbake/ChangeLog
+++ b/bitbake/ChangeLog
@@ -1,4 +1,7 @@
 Changes in BitBake 1.8.x:
+        - Add bb.utils.prune_suffix function
+ 
+Changes in BitBake 1.8.12:
         - Fix -f (force) in conjunction with -b
         - Fix exit code for build failures in --continue mode
         - Fix git branch tags fetching
diff --git a/bitbake/MANIFEST b/bitbake/MANIFEST
index 0671f440bc..39e8017759 100644
--- a/bitbake/MANIFEST
+++ b/bitbake/MANIFEST
@@ -20,6 +20,7 @@ lib/bb/fetch/cvs.py
 lib/bb/fetch/git.py
 lib/bb/fetch/hg.py
 lib/bb/fetch/local.py
+lib/bb/fetch/osc.py
 lib/bb/fetch/perforce.py
 lib/bb/fetch/ssh.py
 lib/bb/fetch/svk.py
diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake
index 6a69e340f1..f3294106ef 100755
--- a/bitbake/bin/bitbake
+++ b/bitbake/bin/bitbake
@@ -27,7 +27,7 @@ sys.path.insert(0,os.path.join(os.path.dirname(os.path.dirname(sys.argv[0])), 'l
 import bb
 from bb import cooker
 
-__version__ = "1.8.11"
+__version__ = "1.8.13"
 
 #============================================================================#
 # BBOptions
diff --git a/bitbake/lib/bb/__init__.py b/bitbake/lib/bb/__init__.py
index c452d529c1..7d01d52b64 100644
--- a/bitbake/lib/bb/__init__.py
+++ b/bitbake/lib/bb/__init__.py
@@ -21,7 +21,7 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-__version__ = "1.8.11"
+__version__ = "1.8.13"
 
 __all__ = [