[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2304/8267] bitbake: fetch2/npm: support subdir= parameter

[Emmanuele Bassi <ebassi src gnome org>]

commit 5ab68677140ad6ffab7fbdeee6caeb19f4d80cba
Author: Paul Eggleton <paul eggleton linux intel com>
Date:   Tue Sep 6 10:57:30 2016 +1200

    bitbake: fetch2/npm: support subdir= parameter
    
    "npmpkg" can be a default, but it should respect the subdir parameter as
    with other FetchMethods. This allows us to have more than one npm://
    entry in SRC_URI without nasty hacks.
    
    Fix required in order to support [YOCTO #9537].
    
    (Bitbake rev: e6a94d2091ec5d42f25102334a8492a731b8dec3)
    
    Signed-off-by: Paul Eggleton <paul eggleton linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 bitbake/lib/bb/fetch2/npm.py |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/bitbake/lib/bb/fetch2/npm.py b/bitbake/lib/bb/fetch2/npm.py
index 9b2d9e1..134bd35 100644
--- a/bitbake/lib/bb/fetch2/npm.py
+++ b/bitbake/lib/bb/fetch2/npm.py
@@ -138,7 +138,12 @@ class Npm(FetchMethod):
             workobj = json.load(datafile)
         dldir = "%s/%s" % (os.path.dirname(ud.localpath), ud.pkgname)
 
-        self._unpackdep(ud, ud.pkgname, workobj,  "%s/npmpkg" % destdir, dldir, d)
+        if 'subdir' in ud.parm:
+            unpackdir = '%s/%s' % (destdir, ud.parm.get('subdir'))
+        else:
+            unpackdir = '%s/npmpkg' % destdir
+
+        self._unpackdep(ud, ud.pkgname, workobj, unpackdir, dldir, d)
 
     def _parse_view(self, output):
         '''