diff options
Diffstat (limited to 'import-layers/yocto-poky/scripts/lib/recipetool')
-rw-r--r-- | import-layers/yocto-poky/scripts/lib/recipetool/create.py | 9 | ||||
-rw-r--r-- | import-layers/yocto-poky/scripts/lib/recipetool/create_npm.py | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/import-layers/yocto-poky/scripts/lib/recipetool/create.py b/import-layers/yocto-poky/scripts/lib/recipetool/create.py index 5bf939efc..a3710285b 100644 --- a/import-layers/yocto-poky/scripts/lib/recipetool/create.py +++ b/import-layers/yocto-poky/scripts/lib/recipetool/create.py @@ -383,8 +383,10 @@ def reformat_git_uri(uri): # which causes decodeurl to fail getting the right host and path if len(host.split(':')) > 1: splitslash = host.split(':') - host = splitslash[0] - path = '/' + splitslash[1] + path + # Port number should not be split from host + if not re.match('^[0-9]+$', splitslash[1]): + host = splitslash[0] + path = '/' + splitslash[1] + path #Algorithm: # if user is defined, append protocol=ssh or if a protocol is defined, then honor the user-defined protocol # if no user & password is defined, check for scheme type and append the protocol with the scheme type @@ -433,6 +435,9 @@ def create_recipe(args): source = 'file://%s' % os.path.abspath(source) if scriptutils.is_src_url(source): + # Warn about github archive URLs + if re.match('https?://github.com/[^/]+/[^/]+/archive/.+(\.tar\..*|\.zip)$', source): + logger.warn('github archive files are not guaranteed to be stable and may be re-generated over time. If the latter occurs, the checksums will likely change and the recipe will fail at do_fetch. It is recommended that you point to an actual commit or tag in the repository instead (using the repository URL in conjunction with the -S/--srcrev option).') # Fetch a URL fetchuri = reformat_git_uri(urldefrag(source)[0]) if args.binary: diff --git a/import-layers/yocto-poky/scripts/lib/recipetool/create_npm.py b/import-layers/yocto-poky/scripts/lib/recipetool/create_npm.py index ae5397262..bb42a5ca5 100644 --- a/import-layers/yocto-poky/scripts/lib/recipetool/create_npm.py +++ b/import-layers/yocto-poky/scripts/lib/recipetool/create_npm.py @@ -73,7 +73,6 @@ class NpmRecipeHandler(RecipeHandler): license = license.replace(' ', '_') if not license[0] == '(': license = '(' + license + ')' - print('LICENSE: {}'.format(license)) else: license = license.replace('AND', '&') if license[0] == '(': @@ -321,6 +320,7 @@ class NpmRecipeHandler(RecipeHandler): blacklist = True break if (not blacklist and 'linux' not in pkg_os) or '!linux' in pkg_os: + pkg = pdata.get('name', 'Unnamed package') logger.debug(2, "Skipping %s since it's incompatible with Linux" % pkg) return False return True |