diff options
Diffstat (limited to 'scripts/lib/devtool/standard.py')
-rw-r--r-- | scripts/lib/devtool/standard.py | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 06b184bca5..cb4b57be92 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py | |||
@@ -65,11 +65,21 @@ def add(args, config, basepath, workspace): | |||
65 | 65 | ||
66 | recipedir = os.path.join(config.workspace_path, 'recipes', args.recipename) | 66 | recipedir = os.path.join(config.workspace_path, 'recipes', args.recipename) |
67 | bb.utils.mkdirhier(recipedir) | 67 | bb.utils.mkdirhier(recipedir) |
68 | rfv = None | ||
68 | if args.version: | 69 | if args.version: |
69 | if '_' in args.version or ' ' in args.version: | 70 | if '_' in args.version or ' ' in args.version: |
70 | logger.error('Invalid version string "%s"' % args.version) | 71 | logger.error('Invalid version string "%s"' % args.version) |
71 | return -1 | 72 | return -1 |
72 | bp = "%s_%s" % (args.recipename, args.version) | 73 | rfv = args.version |
74 | if args.fetch: | ||
75 | if args.fetch.startswith('git://'): | ||
76 | rfv = 'git' | ||
77 | elif args.fetch.startswith('svn://'): | ||
78 | rfv = 'svn' | ||
79 | elif args.fetch.startswith('hg://'): | ||
80 | rfv = 'hg' | ||
81 | if rfv: | ||
82 | bp = "%s_%s" % (args.recipename, rfv) | ||
73 | else: | 83 | else: |
74 | bp = args.recipename | 84 | bp = args.recipename |
75 | recipefile = os.path.join(recipedir, "%s.bb" % bp) | 85 | recipefile = os.path.join(recipedir, "%s.bb" % bp) |
@@ -83,6 +93,8 @@ def add(args, config, basepath, workspace): | |||
83 | extracmdopts = '-x %s' % srctree | 93 | extracmdopts = '-x %s' % srctree |
84 | else: | 94 | else: |
85 | source = srctree | 95 | source = srctree |
96 | if args.version: | ||
97 | extracmdopts += ' -V %s' % args.version | ||
86 | stdout, stderr = exec_build_env_command(config.init_path, basepath, 'recipetool --color=%s create -o %s "%s" %s' % (color, recipefile, source, extracmdopts)) | 98 | stdout, stderr = exec_build_env_command(config.init_path, basepath, 'recipetool --color=%s create -o %s "%s" %s' % (color, recipefile, source, extracmdopts)) |
87 | logger.info('Recipe %s has been automatically created; further editing may be required to make it fully functional' % recipefile) | 99 | logger.info('Recipe %s has been automatically created; further editing may be required to make it fully functional' % recipefile) |
88 | 100 | ||