diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-04-27 10:53:20 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-28 09:44:14 +0100 |
| commit | f1d3b5f1859f0bf411ed05e0695c813b3ed96305 (patch) | |
| tree | 02365c4228d8241e16ff5f28f385d51e3ab04f91 | |
| parent | d1b6e1dfdbd0f77bc21863471db39816cfc3c3be (diff) | |
| download | ast2050-yocto-poky-f1d3b5f1859f0bf411ed05e0695c813b3ed96305.zip ast2050-yocto-poky-f1d3b5f1859f0bf411ed05e0695c813b3ed96305.tar.gz | |
devtool: update-recipe: handle unversioned bbappends
Use the proper bbappend file name, don't just assume it will have a
version suffix (because it won't if the original recipe doesn't).
Fixes [YOCTO #7651].
(From OE-Core master rev: 3332d68ef7b2a300ce8dcf5021497d98e5b17baa)
(From OE-Core rev: 3d5ea16a1f53c12d86c4e8df6af864964541cf02)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | scripts/lib/devtool/standard.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 8932265..0142fe0 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -427,12 +427,6 @@ def update_recipe(args, config, basepath, workspace): logger.error("no recipe named %s in your workspace" % args.recipename) return -1 - # Get initial revision from bbappend - appends = glob.glob(os.path.join(config.workspace_path, 'appends', '%s_*.bbappend' % args.recipename)) - if not appends: - logger.error('unable to find workspace bbappend for recipe %s' % args.recipename) - return -1 - tinfoil = setup_tinfoil() import bb from oe.patch import GitApplyTree @@ -443,6 +437,12 @@ def update_recipe(args, config, basepath, workspace): return -1 recipefile = rd.getVar('FILE', True) + # Get initial revision from bbappend + append = os.path.join(config.workspace_path, 'appends', '%s.bbappend' % os.path.splitext(os.path.basename(recipefile))[0]) + if not os.path.exists(append): + logger.error('unable to find workspace bbappend for recipe %s' % args.recipename) + return -1 + orig_src_uri = rd.getVar('SRC_URI', False) or '' if args.mode == 'auto': if 'git://' in orig_src_uri: @@ -513,7 +513,7 @@ def update_recipe(args, config, basepath, workspace): initial_rev = args.initial_rev else: initial_rev = None - with open(appends[0], 'r') as f: + with open(append, 'r') as f: for line in f: if line.startswith('# initial_rev:'): initial_rev = line.split(':')[-1].strip() |
