From 091cee2bdc2378a3425a4ef8558d03e6f9c021ff Mon Sep 17 00:00:00 2001 From: Chang Rebecca Swee Fun Date: Mon, 21 Aug 2017 17:39:40 +1200 Subject: recipetool: create: disable PREMIRRORS and MIRRORS by default When creating new recipes, we are almost certainly fetching a new source rather that something that has already been fetched. I have disable PREMIRRORS and MIRRORS settings in the recipe that created by devtool while leaving an option for users to enable them manually if needed. Since devtool already has this options, we need to ensure that recipetool is able to handle the options passed from devtool. Signed-off-by: Chang Rebecca Swee Fun Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- scripts/lib/recipetool/create.py | 1 + scripts/lib/scriptutils.py | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'scripts/lib') diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py index e21e2bf298..2c3a58a143 100644 --- a/scripts/lib/recipetool/create.py +++ b/scripts/lib/recipetool/create.py @@ -1169,5 +1169,6 @@ def register_commands(subparsers): parser_create.add_argument('--keep-temp', action="store_true", help='Keep temporary directory (for debugging)') parser_create.add_argument('--fetch-dev', action="store_true", help='For npm, also fetch devDependencies') parser_create.add_argument('--devtool', action="store_true", help=argparse.SUPPRESS) + parser_create.add_argument('--mirrors', action="store_true", help='Enable PREMIRRORS and MIRRORS for source tree fetching (disabled by default).') parser_create.set_defaults(func=create_recipe) diff --git a/scripts/lib/scriptutils.py b/scripts/lib/scriptutils.py index 97854385d5..11f1a78e97 100644 --- a/scripts/lib/scriptutils.py +++ b/scripts/lib/scriptutils.py @@ -102,7 +102,7 @@ class FetchUrlFailure(Exception): def __str__(self): return "Failed to fetch URL %s" % self.url -def fetch_url(tinfoil, srcuri, srcrev, destdir, logger, preserve_tmp=False): +def fetch_url(tinfoil, srcuri, srcrev, destdir, logger, preserve_tmp=False, mirrors=False): """ Fetch the specified URL using normal do_fetch and do_unpack tasks, i.e. any dependencies that need to be satisfied in order to support the fetch @@ -150,6 +150,13 @@ def fetch_url(tinfoil, srcuri, srcrev, destdir, logger, preserve_tmp=False): f.write('WORKDIR = "%s"\n' % tmpworkdir) # Set S out of the way so it doesn't get created under the workdir f.write('S = "%s"\n' % os.path.join(tmpdir, 'emptysrc')) + if not mirrors: + # We do not need PREMIRRORS since we are almost certainly + # fetching new source rather than something that has already + # been fetched. Hence, we disable them by default. + # However, we provide an option for users to enable it. + f.write('PREMIRRORS = ""\n') + f.write('MIRRORS = ""\n') logger.info('Fetching %s...' % srcuri) -- cgit v1.2.3