diff options
Diffstat (limited to 'bitbake/lib/bblayers')
| -rw-r--r-- | bitbake/lib/bblayers/action.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/bitbake/lib/bblayers/action.py b/bitbake/lib/bblayers/action.py index 0d7fd6edd1..a8f2699335 100644 --- a/bitbake/lib/bblayers/action.py +++ b/bitbake/lib/bblayers/action.py | |||
| @@ -50,12 +50,14 @@ class ActionPlugin(LayerPlugin): | |||
| 50 | 50 | ||
| 51 | try: | 51 | try: |
| 52 | notadded, _ = bb.utils.edit_bblayers_conf(bblayers_conf, layerdirs, None) | 52 | notadded, _ = bb.utils.edit_bblayers_conf(bblayers_conf, layerdirs, None) |
| 53 | self.tinfoil.modified_files() | ||
| 53 | if not (args.force or notadded): | 54 | if not (args.force or notadded): |
| 54 | try: | 55 | try: |
| 55 | self.tinfoil.run_command('parseConfiguration') | 56 | self.tinfoil.run_command('parseConfiguration') |
| 56 | except (bb.tinfoil.TinfoilUIException, bb.BBHandledException): | 57 | except (bb.tinfoil.TinfoilUIException, bb.BBHandledException): |
| 57 | # Restore the back up copy of bblayers.conf | 58 | # Restore the back up copy of bblayers.conf |
| 58 | shutil.copy2(backup, bblayers_conf) | 59 | shutil.copy2(backup, bblayers_conf) |
| 60 | self.tinfoil.modified_files() | ||
| 59 | bb.fatal("Parse failure with the specified layer added, exiting.") | 61 | bb.fatal("Parse failure with the specified layer added, exiting.") |
| 60 | else: | 62 | else: |
| 61 | for item in notadded: | 63 | for item in notadded: |
| @@ -81,6 +83,7 @@ class ActionPlugin(LayerPlugin): | |||
| 81 | layerdir = os.path.abspath(item) | 83 | layerdir = os.path.abspath(item) |
| 82 | layerdirs.append(layerdir) | 84 | layerdirs.append(layerdir) |
| 83 | (_, notremoved) = bb.utils.edit_bblayers_conf(bblayers_conf, None, layerdirs) | 85 | (_, notremoved) = bb.utils.edit_bblayers_conf(bblayers_conf, None, layerdirs) |
| 86 | self.tinfoil.modified_files() | ||
| 84 | if notremoved: | 87 | if notremoved: |
| 85 | for item in notremoved: | 88 | for item in notremoved: |
| 86 | sys.stderr.write("No layers matching %s found in BBLAYERS\n" % item) | 89 | sys.stderr.write("No layers matching %s found in BBLAYERS\n" % item) |
| @@ -240,6 +243,9 @@ build results (as the layer priority order has effectively changed). | |||
| 240 | if not entry_found: | 243 | if not entry_found: |
| 241 | logger.warning("File %s does not match the flattened layer's BBFILES setting, you may need to edit conf/layer.conf or move the file elsewhere" % f1full) | 244 | logger.warning("File %s does not match the flattened layer's BBFILES setting, you may need to edit conf/layer.conf or move the file elsewhere" % f1full) |
| 242 | 245 | ||
| 246 | self.tinfoil.modified_files() | ||
| 247 | |||
| 248 | |||
| 243 | def get_file_layer(self, filename): | 249 | def get_file_layer(self, filename): |
| 244 | layerdir = self.get_file_layerdir(filename) | 250 | layerdir = self.get_file_layerdir(filename) |
| 245 | if layerdir: | 251 | if layerdir: |
