diff options
Diffstat (limited to 'scripts/lib')
-rw-r--r-- | scripts/lib/devtool/standard.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 0103d936b5..195da1a68c 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py | |||
@@ -908,14 +908,13 @@ def _update_recipe_srcrev(args, srctree, rd, config_data): | |||
908 | 908 | ||
909 | _remove_source_files(args, remove_files, destpath) | 909 | _remove_source_files(args, remove_files, destpath) |
910 | 910 | ||
911 | def _update_recipe_patch(args, config, srctree, rd, config_data): | 911 | def _update_recipe_patch(args, config, workspace, srctree, rd, config_data): |
912 | """Implement the 'patch' mode of update-recipe""" | 912 | """Implement the 'patch' mode of update-recipe""" |
913 | import bb | 913 | import bb |
914 | import oe.recipeutils | 914 | import oe.recipeutils |
915 | 915 | ||
916 | recipefile = rd.getVar('FILE', True) | 916 | recipefile = rd.getVar('FILE', True) |
917 | append = os.path.join(config.workspace_path, 'appends', '%s.bbappend' % | 917 | append = workspace[args.recipename]['bbappend'] |
918 | os.path.splitext(os.path.basename(recipefile))[0]) | ||
919 | if not os.path.exists(append): | 918 | if not os.path.exists(append): |
920 | raise DevtoolError('unable to find workspace bbappend for recipe %s' % | 919 | raise DevtoolError('unable to find workspace bbappend for recipe %s' % |
921 | args.recipename) | 920 | args.recipename) |
@@ -1063,7 +1062,7 @@ def update_recipe(args, config, basepath, workspace): | |||
1063 | if mode == 'srcrev': | 1062 | if mode == 'srcrev': |
1064 | _update_recipe_srcrev(args, srctree, rd, tinfoil.config_data) | 1063 | _update_recipe_srcrev(args, srctree, rd, tinfoil.config_data) |
1065 | elif mode == 'patch': | 1064 | elif mode == 'patch': |
1066 | _update_recipe_patch(args, config, srctree, rd, tinfoil.config_data) | 1065 | _update_recipe_patch(args, config, workspace, srctree, rd, tinfoil.config_data) |
1067 | else: | 1066 | else: |
1068 | raise DevtoolError('update_recipe: invalid mode %s' % mode) | 1067 | raise DevtoolError('update_recipe: invalid mode %s' % mode) |
1069 | 1068 | ||