From 2a7318133bbd64f5dcb2ddf400229d4627925580 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 26 Feb 2016 17:36:49 +0000 Subject: bitbake: fetch2: Fix unpack for absolute file urls The previous commit breaks absolute pathnames in file:// urls, this fixes it. (Bitbake rev: b8113a1800687a37a26ac28deafdbafd74cc138e) Signed-off-by: Richard Purdie --- bitbake/lib/bb/fetch2/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'bitbake/lib/bb/fetch2/__init__.py') diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index 9ebdcdb91d..e8d3af72e8 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py @@ -1394,7 +1394,10 @@ class FetchMethod(object): destdir = '.' # For file:// entries all intermediate dirs in path must be created at destination if urldata.type == "file": - urlpath = urldata.path.rstrip('/') # Trailing '/' does a copying to wrong place + # Trailing '/' does a copying to wrong place + urlpath = urldata.path.rstrip('/') + # Want files places relative to cwd so no leading '/' + urlpath = urlpath.lstrip('/') if urlpath.find("/") != -1: destdir = urlpath.rsplit("/", 1)[0] + '/' bb.utils.mkdirhier("%s/%s" % (unpackdir, destdir)) -- cgit v1.2.3-54-g00ecf