mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
lib/oe/package: remove unneeded npm_split_package_dirs function
The npm_split_package_dirs function was used by the recipetool when creating npm recipes. This is not the case anymore. (From OE-Core rev: 6cd834737eaa42592e83300099c152e2cfef568c) Signed-off-by: Jean-Marie LEMETAYER <jean-marie.lemetayer@savoirfairelinux.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
cfa5544005
commit
3b0640c993
@@ -283,36 +283,3 @@ def read_shlib_providers(d):
|
||||
shlib_provider[s[0]] = {}
|
||||
shlib_provider[s[0]][s[1]] = (dep_pkg, s[2])
|
||||
return shlib_provider
|
||||
|
||||
|
||||
def npm_split_package_dirs(pkgdir):
|
||||
"""
|
||||
Work out the packages fetched and unpacked by BitBake's npm fetcher
|
||||
Returns a dict of packagename -> (relpath, package.json) ordered
|
||||
such that it is suitable for use in PACKAGES and FILES
|
||||
"""
|
||||
from collections import OrderedDict
|
||||
import json
|
||||
packages = {}
|
||||
for root, dirs, files in os.walk(pkgdir):
|
||||
if os.path.basename(root) == 'node_modules':
|
||||
for dn in dirs:
|
||||
relpth = os.path.relpath(os.path.join(root, dn), pkgdir)
|
||||
pkgitems = ['${PN}']
|
||||
for pathitem in relpth.split('/'):
|
||||
if pathitem == 'node_modules':
|
||||
continue
|
||||
pkgitems.append(pathitem)
|
||||
pkgname = '-'.join(pkgitems).replace('_', '-')
|
||||
pkgname = pkgname.replace('@', '')
|
||||
pkgfile = os.path.join(root, dn, 'package.json')
|
||||
data = None
|
||||
if os.path.exists(pkgfile):
|
||||
with open(pkgfile, 'r') as f:
|
||||
data = json.loads(f.read())
|
||||
packages[pkgname] = (relpth, data)
|
||||
# We want the main package for a module sorted *after* its subpackages
|
||||
# (so that it doesn't otherwise steal the files for the subpackage), so
|
||||
# this is a cheap way to do that whilst still having an otherwise
|
||||
# alphabetical sort
|
||||
return OrderedDict((key, packages[key]) for key in sorted(packages, key=lambda pkg: pkg + '~'))
|
||||
|
||||
Reference in New Issue
Block a user