[gnome-continuous-yocto/gnomeostree-3.28-rocko: 570/8267] recipetool: create: use ${BP} for subdir for binary packages

[Emmanuele Bassi <ebassi src gnome org>]

commit 0a7c699b3337806c63b745bf1e9736d296b8e42f
Author: Paul Eggleton <paul eggleton linux intel com>
Date:   Mon May 30 10:21:01 2016 +1200

    recipetool: create: use ${BP} for subdir for binary packages
    
    If we use ${BP} for the subdirectory, the default value of S will work
    rather than having to have an ugly value derived from the package
    file name in both places. This does mean that we have to assume the
    default though (we can't just let the normal logic work because the
    value of BP is the default until later on, so the replacement doesn't
    work).
    
    (From OE-Core rev: 13bc2438d61c345a8f229b9d83bf36a14d08916f)
    
    Signed-off-by: Paul Eggleton <paul eggleton linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/recipetool/create.py |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py
index ad26189..1899a0d 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -359,7 +359,7 @@ def create_recipe(args):
         if args.binary:
             # Assume the archive contains the directory structure verbatim
             # so we need to extract to a subdirectory
-            fetchuri += ';subdir=%s' % 
os.path.splitext(os.path.basename(urlparse.urlsplit(fetchuri).path))[0]
+            fetchuri += ';subdir=${BP}'
         srcuri = fetchuri
         rev_re = re.compile(';rev=([^;]+)')
         res = rev_re.search(srcuri)
@@ -566,7 +566,9 @@ def create_recipe(args):
         lines_before.append('SRCREV = "%s"' % srcrev)
     lines_before.append('')
 
-    if srcsubdir:
+    if srcsubdir and not args.binary:
+        # (for binary packages we explicitly specify subdir= when fetching to
+        # match the default value of S, so we don't need to set it in that case)
         lines_before.append('S = "${WORKDIR}/%s"' % srcsubdir)
         lines_before.append('')