diff options
Diffstat (limited to 'scripts/lib/recipetool/create.py')
-rw-r--r-- | scripts/lib/recipetool/create.py | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py index 2a6a28ba91..359eb9adfc 100644 --- a/scripts/lib/recipetool/create.py +++ b/scripts/lib/recipetool/create.py | |||
@@ -1152,22 +1152,6 @@ def convert_rpm_xml(xmlfile): | |||
1152 | return values | 1152 | return values |
1153 | 1153 | ||
1154 | 1154 | ||
1155 | def check_npm(tinfoil, debugonly=False): | ||
1156 | try: | ||
1157 | rd = tinfoil.parse_recipe('nodejs-native') | ||
1158 | except bb.providers.NoProvider: | ||
1159 | # We still conditionally show the message and exit with the special | ||
1160 | # return code, otherwise we can't show the proper message for eSDK | ||
1161 | # users | ||
1162 | log_error_cond('nodejs-native is required for npm but is not available - you will likely need to add a layer that provides nodejs', debugonly) | ||
1163 | sys.exit(14) | ||
1164 | bindir = rd.getVar('STAGING_BINDIR_NATIVE') | ||
1165 | npmpath = os.path.join(bindir, 'npm') | ||
1166 | if not os.path.exists(npmpath): | ||
1167 | log_error_cond('npm required to process specified source, but npm is not available - you need to run bitbake -c addto_recipe_sysroot nodejs-native first', debugonly) | ||
1168 | sys.exit(14) | ||
1169 | return bindir | ||
1170 | |||
1171 | def register_commands(subparsers): | 1155 | def register_commands(subparsers): |
1172 | parser_create = subparsers.add_parser('create', | 1156 | parser_create = subparsers.add_parser('create', |
1173 | help='Create a new recipe', | 1157 | help='Create a new recipe', |
@@ -1185,8 +1169,5 @@ def register_commands(subparsers): | |||
1185 | parser_create.add_argument('--keep-temp', action="store_true", help='Keep temporary directory (for debugging)') | 1169 | parser_create.add_argument('--keep-temp', action="store_true", help='Keep temporary directory (for debugging)') |
1186 | parser_create.add_argument('--fetch-dev', action="store_true", help='For npm, also fetch devDependencies') | 1170 | parser_create.add_argument('--fetch-dev', action="store_true", help='For npm, also fetch devDependencies') |
1187 | parser_create.add_argument('--devtool', action="store_true", help=argparse.SUPPRESS) | 1171 | parser_create.add_argument('--devtool', action="store_true", help=argparse.SUPPRESS) |
1188 | # FIXME I really hate having to set parserecipes for this, but given we may need | 1172 | parser_create.set_defaults(func=create_recipe) |
1189 | # to call into npm (and we don't know in advance if we will or not) and in order | ||
1190 | # to do so we need to know npm's recipe sysroot path, there's not much alternative | ||
1191 | parser_create.set_defaults(func=create_recipe, parserecipes=True) | ||
1192 | 1173 | ||