diff options
-rw-r--r-- | meta/lib/oe/terminal.py | 6 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/context.py | 2 | ||||
-rw-r--r-- | meta/lib/oeqa/utils/qemurunner.py | 4 | ||||
-rwxr-xr-x | scripts/combo-layer | 2 | ||||
-rwxr-xr-x | scripts/contrib/verify-homepage.py | 2 | ||||
-rw-r--r-- | scripts/lib/devtool/export.py | 2 | ||||
-rw-r--r-- | scripts/lib/devtool/import.py | 8 | ||||
-rw-r--r-- | scripts/lib/devtool/standard.py | 16 | ||||
-rw-r--r-- | scripts/lib/devtool/upgrade.py | 6 | ||||
-rw-r--r-- | scripts/lib/recipetool/append.py | 14 | ||||
-rw-r--r-- | scripts/lib/recipetool/create.py | 4 | ||||
-rw-r--r-- | scripts/lib/recipetool/create_kmod.py | 2 | ||||
-rw-r--r-- | scripts/lib/recipetool/create_npm.py | 6 | ||||
-rw-r--r-- | scripts/lib/recipetool/newappend.py | 4 | ||||
-rw-r--r-- | scripts/lib/wic/engine.py | 2 | ||||
-rwxr-xr-x | scripts/runqemu | 16 |
16 files changed, 48 insertions, 48 deletions
diff --git a/meta/lib/oe/terminal.py b/meta/lib/oe/terminal.py index 94afe394ed..caeb5e31ec 100644 --- a/meta/lib/oe/terminal.py +++ b/meta/lib/oe/terminal.py | |||
@@ -112,7 +112,7 @@ class Screen(Terminal): | |||
112 | bb.event.fire(bb.event.LogExecTTY(msg, "screen -r %s" % s_id, | 112 | bb.event.fire(bb.event.LogExecTTY(msg, "screen -r %s" % s_id, |
113 | 0.5, 10), d) | 113 | 0.5, 10), d) |
114 | else: | 114 | else: |
115 | logger.warn(msg) | 115 | logger.warning(msg) |
116 | 116 | ||
117 | class TmuxRunning(Terminal): | 117 | class TmuxRunning(Terminal): |
118 | """Open a new pane in the current running tmux window""" | 118 | """Open a new pane in the current running tmux window""" |
@@ -168,7 +168,7 @@ class Tmux(Terminal): | |||
168 | if d: | 168 | if d: |
169 | bb.event.fire(bb.event.LogExecTTY(msg, attach_cmd, 0.5, 10), d) | 169 | bb.event.fire(bb.event.LogExecTTY(msg, attach_cmd, 0.5, 10), d) |
170 | else: | 170 | else: |
171 | logger.warn(msg) | 171 | logger.warning(msg) |
172 | 172 | ||
173 | class Custom(Terminal): | 173 | class Custom(Terminal): |
174 | command = 'false' # This is a placeholder | 174 | command = 'false' # This is a placeholder |
@@ -180,7 +180,7 @@ class Custom(Terminal): | |||
180 | if not '{command}' in self.command: | 180 | if not '{command}' in self.command: |
181 | self.command += ' {command}' | 181 | self.command += ' {command}' |
182 | Terminal.__init__(self, sh_cmd, title, env, d) | 182 | Terminal.__init__(self, sh_cmd, title, env, d) |
183 | logger.warn('Custom terminal was started.') | 183 | logger.warning('Custom terminal was started.') |
184 | else: | 184 | else: |
185 | logger.debug(1, 'No custom terminal (OE_TERMINAL_CUSTOMCMD) set') | 185 | logger.debug(1, 'No custom terminal (OE_TERMINAL_CUSTOMCMD) set') |
186 | raise UnsupportedTerminal('OE_TERMINAL_CUSTOMCMD not set') | 186 | raise UnsupportedTerminal('OE_TERMINAL_CUSTOMCMD not set') |
diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index c937b8171c..16812ba96e 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py | |||
@@ -156,7 +156,7 @@ class OESelftestTestContextExecutor(OETestContextExecutor): | |||
156 | os.chdir(builddir) | 156 | os.chdir(builddir) |
157 | 157 | ||
158 | if not "meta-selftest" in self.tc.td["BBLAYERS"]: | 158 | if not "meta-selftest" in self.tc.td["BBLAYERS"]: |
159 | self.tc.logger.warn("meta-selftest layer not found in BBLAYERS, adding it") | 159 | self.tc.logger.warning("meta-selftest layer not found in BBLAYERS, adding it") |
160 | meta_selftestdir = os.path.join( | 160 | meta_selftestdir = os.path.join( |
161 | self.tc.td["BBLAYERS_FETCH_DIR"], 'meta-selftest') | 161 | self.tc.td["BBLAYERS_FETCH_DIR"], 'meta-selftest') |
162 | if os.path.isdir(meta_selftestdir): | 162 | if os.path.isdir(meta_selftestdir): |
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index c962602a63..c8bd6516cf 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py | |||
@@ -384,7 +384,7 @@ class QemuRunner: | |||
384 | # qemu-system behaves well and a SIGTERM is enough | 384 | # qemu-system behaves well and a SIGTERM is enough |
385 | os.kill(self.qemupid, signal.SIGTERM) | 385 | os.kill(self.qemupid, signal.SIGTERM) |
386 | except ProcessLookupError as e: | 386 | except ProcessLookupError as e: |
387 | self.logger.warn('qemu-system ended unexpectedly') | 387 | self.logger.warning('qemu-system ended unexpectedly') |
388 | 388 | ||
389 | def stop_thread(self): | 389 | def stop_thread(self): |
390 | if self.thread and self.thread.is_alive(): | 390 | if self.thread and self.thread.is_alive(): |
@@ -461,7 +461,7 @@ class QemuRunner: | |||
461 | 461 | ||
462 | def _dump_host(self): | 462 | def _dump_host(self): |
463 | self.host_dumper.create_dir("qemu") | 463 | self.host_dumper.create_dir("qemu") |
464 | self.logger.warn("Qemu ended unexpectedly, dump data from host" | 464 | self.logger.warning("Qemu ended unexpectedly, dump data from host" |
465 | " is in %s" % self.host_dumper.dump_dir) | 465 | " is in %s" % self.host_dumper.dump_dir) |
466 | self.host_dumper.dump_host() | 466 | self.host_dumper.dump_host() |
467 | 467 | ||
diff --git a/scripts/combo-layer b/scripts/combo-layer index d04d88b070..dc40e72404 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer | |||
@@ -246,7 +246,7 @@ def action_init(conf, args): | |||
246 | # traditional behavior from "git archive" (preserved | 246 | # traditional behavior from "git archive" (preserved |
247 | # here) it to choose the first one. This might not be | 247 | # here) it to choose the first one. This might not be |
248 | # intended, so at least warn about it. | 248 | # intended, so at least warn about it. |
249 | logger.warn("%s: initial revision '%s' not unique, picking result of rev-parse = %s" % | 249 | logger.warning("%s: initial revision '%s' not unique, picking result of rev-parse = %s" % |
250 | (name, initialrev, refs[0])) | 250 | (name, initialrev, refs[0])) |
251 | initialrev = rev | 251 | initialrev = rev |
252 | except: | 252 | except: |
diff --git a/scripts/contrib/verify-homepage.py b/scripts/contrib/verify-homepage.py index 76f1749cfa..cc6e797d8b 100755 --- a/scripts/contrib/verify-homepage.py +++ b/scripts/contrib/verify-homepage.py | |||
@@ -27,7 +27,7 @@ logger = scriptutils.logger_create('verify_homepage') | |||
27 | def wgetHomepage(pn, homepage): | 27 | def wgetHomepage(pn, homepage): |
28 | result = subprocess.call('wget ' + '-q -T 5 -t 1 --spider ' + homepage, shell = True) | 28 | result = subprocess.call('wget ' + '-q -T 5 -t 1 --spider ' + homepage, shell = True) |
29 | if result: | 29 | if result: |
30 | logger.warn("%s: failed to verify HOMEPAGE: %s " % (pn, homepage)) | 30 | logger.warning("%s: failed to verify HOMEPAGE: %s " % (pn, homepage)) |
31 | return 1 | 31 | return 1 |
32 | else: | 32 | else: |
33 | return 0 | 33 | return 0 |
diff --git a/scripts/lib/devtool/export.py b/scripts/lib/devtool/export.py index 13ee258e7a..35349e2cda 100644 --- a/scripts/lib/devtool/export.py +++ b/scripts/lib/devtool/export.py | |||
@@ -84,7 +84,7 @@ def export(args, config, basepath, workspace): | |||
84 | 84 | ||
85 | # if all workspace is excluded, quit | 85 | # if all workspace is excluded, quit |
86 | if not len(set(workspace.keys()).difference(set(args.exclude))): | 86 | if not len(set(workspace.keys()).difference(set(args.exclude))): |
87 | logger.warn('All recipes in workspace excluded, nothing to export') | 87 | logger.warning('All recipes in workspace excluded, nothing to export') |
88 | return 0 | 88 | return 0 |
89 | 89 | ||
90 | exported = [] | 90 | exported = [] |
diff --git a/scripts/lib/devtool/import.py b/scripts/lib/devtool/import.py index c13a180d14..4264b7d820 100644 --- a/scripts/lib/devtool/import.py +++ b/scripts/lib/devtool/import.py | |||
@@ -81,7 +81,7 @@ def devimport(args, config, basepath, workspace): | |||
81 | break | 81 | break |
82 | else: | 82 | else: |
83 | non_importables.append(fn) | 83 | non_importables.append(fn) |
84 | logger.warn('No recipe to append %s.bbapppend, skipping' % fn) | 84 | logger.warning('No recipe to append %s.bbapppend, skipping' % fn) |
85 | 85 | ||
86 | # Extract | 86 | # Extract |
87 | imported = [] | 87 | imported = [] |
@@ -104,9 +104,9 @@ def devimport(args, config, basepath, workspace): | |||
104 | try: | 104 | try: |
105 | tar.extract(member, path=config.workspace_path) | 105 | tar.extract(member, path=config.workspace_path) |
106 | except PermissionError as pe: | 106 | except PermissionError as pe: |
107 | logger.warn(pe) | 107 | logger.warning(pe) |
108 | else: | 108 | else: |
109 | logger.warn('File already present. Use --overwrite/-o to overwrite it: %s' % member.name) | 109 | logger.warning('File already present. Use --overwrite/-o to overwrite it: %s' % member.name) |
110 | continue | 110 | continue |
111 | else: | 111 | else: |
112 | tar.extract(member, path=config.workspace_path) | 112 | tar.extract(member, path=config.workspace_path) |
@@ -129,7 +129,7 @@ def devimport(args, config, basepath, workspace): | |||
129 | if imported: | 129 | if imported: |
130 | logger.info('Imported recipes into workspace %s: %s' % (config.workspace_path, ', '.join(imported))) | 130 | logger.info('Imported recipes into workspace %s: %s' % (config.workspace_path, ', '.join(imported))) |
131 | else: | 131 | else: |
132 | logger.warn('No recipes imported into the workspace') | 132 | logger.warning('No recipes imported into the workspace') |
133 | 133 | ||
134 | return 0 | 134 | return 0 |
135 | 135 | ||
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index a1e8e1d322..d14b7a6543 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py | |||
@@ -66,7 +66,7 @@ def add(args, config, basepath, workspace): | |||
66 | args.srctree = args.recipename | 66 | args.srctree = args.recipename |
67 | args.recipename = None | 67 | args.recipename = None |
68 | elif os.path.isdir(args.recipename): | 68 | elif os.path.isdir(args.recipename): |
69 | logger.warn('Ambiguous argument "%s" - assuming you mean it to be the recipe name' % args.recipename) | 69 | logger.warning('Ambiguous argument "%s" - assuming you mean it to be the recipe name' % args.recipename) |
70 | 70 | ||
71 | if not args.fetchuri: | 71 | if not args.fetchuri: |
72 | if args.srcrev: | 72 | if args.srcrev: |
@@ -82,7 +82,7 @@ def add(args, config, basepath, workspace): | |||
82 | if args.fetchuri: | 82 | if args.fetchuri: |
83 | raise DevtoolError('URI specified as positional argument as well as -f/--fetch') | 83 | raise DevtoolError('URI specified as positional argument as well as -f/--fetch') |
84 | else: | 84 | else: |
85 | logger.warn('-f/--fetch option is deprecated - you can now simply specify the URL to fetch as a positional argument instead') | 85 | logger.warning('-f/--fetch option is deprecated - you can now simply specify the URL to fetch as a positional argument instead') |
86 | args.fetchuri = args.fetch | 86 | args.fetchuri = args.fetch |
87 | 87 | ||
88 | if args.recipename: | 88 | if args.recipename: |
@@ -217,7 +217,7 @@ def add(args, config, basepath, workspace): | |||
217 | raise DevtoolError('Command \'%s\' did not create any recipe file:\n%s' % (e.command, e.stdout)) | 217 | raise DevtoolError('Command \'%s\' did not create any recipe file:\n%s' % (e.command, e.stdout)) |
218 | attic_recipe = os.path.join(config.workspace_path, 'attic', recipename, os.path.basename(recipefile)) | 218 | attic_recipe = os.path.join(config.workspace_path, 'attic', recipename, os.path.basename(recipefile)) |
219 | if os.path.exists(attic_recipe): | 219 | if os.path.exists(attic_recipe): |
220 | logger.warn('A modified recipe from a previous invocation exists in %s - you may wish to move this over the top of the new recipe if you had changes in it that you want to continue with' % attic_recipe) | 220 | logger.warning('A modified recipe from a previous invocation exists in %s - you may wish to move this over the top of the new recipe if you had changes in it that you want to continue with' % attic_recipe) |
221 | finally: | 221 | finally: |
222 | if tmpsrcdir and os.path.exists(tmpsrcdir): | 222 | if tmpsrcdir and os.path.exists(tmpsrcdir): |
223 | shutil.rmtree(tmpsrcdir) | 223 | shutil.rmtree(tmpsrcdir) |
@@ -295,7 +295,7 @@ def add(args, config, basepath, workspace): | |||
295 | with open(layerconf_file, 'a') as f: | 295 | with open(layerconf_file, 'a') as f: |
296 | f.write('%s = "%s"\n' % (preferred_provider, recipe_name)) | 296 | f.write('%s = "%s"\n' % (preferred_provider, recipe_name)) |
297 | else: | 297 | else: |
298 | logger.warn('Set \'%s\' in order to use the recipe' % preferred_provider) | 298 | logger.warning('Set \'%s\' in order to use the recipe' % preferred_provider) |
299 | break | 299 | break |
300 | 300 | ||
301 | _add_md5(config, recipename, appendfile) | 301 | _add_md5(config, recipename, appendfile) |
@@ -704,7 +704,7 @@ def _check_preserve(config, recipename): | |||
704 | if splitline[2] != md5: | 704 | if splitline[2] != md5: |
705 | bb.utils.mkdirhier(preservepath) | 705 | bb.utils.mkdirhier(preservepath) |
706 | preservefile = os.path.basename(removefile) | 706 | preservefile = os.path.basename(removefile) |
707 | logger.warn('File %s modified since it was written, preserving in %s' % (preservefile, preservepath)) | 707 | logger.warning('File %s modified since it was written, preserving in %s' % (preservefile, preservepath)) |
708 | shutil.move(removefile, os.path.join(preservepath, preservefile)) | 708 | shutil.move(removefile, os.path.join(preservepath, preservefile)) |
709 | else: | 709 | else: |
710 | os.remove(removefile) | 710 | os.remove(removefile) |
@@ -795,7 +795,7 @@ def modify(args, config, basepath, workspace): | |||
795 | if branchname.startswith(override_branch_prefix): | 795 | if branchname.startswith(override_branch_prefix): |
796 | branches.append(branchname) | 796 | branches.append(branchname) |
797 | if branches: | 797 | if branches: |
798 | logger.warn('SRC_URI is conditionally overridden in this recipe, thus several %s* branches have been created, one for each override that makes changes to SRC_URI. It is recommended that you make changes to the %s branch first, then checkout and rebase each %s* branch and update any unique patches there (duplicates on those branches will be ignored by devtool finish/update-recipe)' % (override_branch_prefix, args.branch, override_branch_prefix)) | 798 | logger.warning('SRC_URI is conditionally overridden in this recipe, thus several %s* branches have been created, one for each override that makes changes to SRC_URI. It is recommended that you make changes to the %s branch first, then checkout and rebase each %s* branch and update any unique patches there (duplicates on those branches will be ignored by devtool finish/update-recipe)' % (override_branch_prefix, args.branch, override_branch_prefix)) |
799 | branches.insert(0, args.branch) | 799 | branches.insert(0, args.branch) |
800 | seen_patches = [] | 800 | seen_patches = [] |
801 | for branch in branches: | 801 | for branch in branches: |
@@ -1720,7 +1720,7 @@ def update_recipe(args, config, basepath, workspace): | |||
1720 | if updated: | 1720 | if updated: |
1721 | rf = rd.getVar('FILE') | 1721 | rf = rd.getVar('FILE') |
1722 | if rf.startswith(config.workspace_path): | 1722 | if rf.startswith(config.workspace_path): |
1723 | logger.warn('Recipe file %s has been updated but is inside the workspace - you will need to move it (and any associated files next to it) out to the desired layer before using "devtool reset" in order to keep any changes' % rf) | 1723 | logger.warning('Recipe file %s has been updated but is inside the workspace - you will need to move it (and any associated files next to it) out to the desired layer before using "devtool reset" in order to keep any changes' % rf) |
1724 | finally: | 1724 | finally: |
1725 | tinfoil.shutdown() | 1725 | tinfoil.shutdown() |
1726 | 1726 | ||
@@ -1803,7 +1803,7 @@ def _reset(recipes, no_clean, config, basepath, workspace): | |||
1803 | if os.path.exists(origdir): | 1803 | if os.path.exists(origdir): |
1804 | for root, dirs, files in os.walk(origdir): | 1804 | for root, dirs, files in os.walk(origdir): |
1805 | for fn in files: | 1805 | for fn in files: |
1806 | logger.warn('Preserving %s in %s' % (fn, preservepath)) | 1806 | logger.warning('Preserving %s in %s' % (fn, preservepath)) |
1807 | _move_file(os.path.join(origdir, fn), | 1807 | _move_file(os.path.join(origdir, fn), |
1808 | os.path.join(preservepath, fn)) | 1808 | os.path.join(preservepath, fn)) |
1809 | for dn in dirs: | 1809 | for dn in dirs: |
diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py index 1dde16641b..202007793b 100644 --- a/scripts/lib/devtool/upgrade.py +++ b/scripts/lib/devtool/upgrade.py | |||
@@ -264,7 +264,7 @@ def _extract_new_source(newpv, srctree, no_patch, srcrev, srcbranch, branch, kee | |||
264 | if no_patch: | 264 | if no_patch: |
265 | patches = oe.recipeutils.get_recipe_patches(crd) | 265 | patches = oe.recipeutils.get_recipe_patches(crd) |
266 | if patches: | 266 | if patches: |
267 | logger.warn('By user choice, the following patches will NOT be applied to the new source tree:\n %s' % '\n '.join([os.path.basename(patch) for patch in patches])) | 267 | logger.warning('By user choice, the following patches will NOT be applied to the new source tree:\n %s' % '\n '.join([os.path.basename(patch) for patch in patches])) |
268 | else: | 268 | else: |
269 | __run('git checkout devtool-patched -b %s' % branch) | 269 | __run('git checkout devtool-patched -b %s' % branch) |
270 | skiptag = False | 270 | skiptag = False |
@@ -273,9 +273,9 @@ def _extract_new_source(newpv, srctree, no_patch, srcrev, srcbranch, branch, kee | |||
273 | except bb.process.ExecutionError as e: | 273 | except bb.process.ExecutionError as e: |
274 | skiptag = True | 274 | skiptag = True |
275 | if 'conflict' in e.stdout: | 275 | if 'conflict' in e.stdout: |
276 | logger.warn('Command \'%s\' failed:\n%s\n\nYou will need to resolve conflicts in order to complete the upgrade.' % (e.command, e.stdout.rstrip())) | 276 | logger.warning('Command \'%s\' failed:\n%s\n\nYou will need to resolve conflicts in order to complete the upgrade.' % (e.command, e.stdout.rstrip())) |
277 | else: | 277 | else: |
278 | logger.warn('Command \'%s\' failed:\n%s' % (e.command, e.stdout)) | 278 | logger.warning('Command \'%s\' failed:\n%s' % (e.command, e.stdout)) |
279 | if not skiptag: | 279 | if not skiptag: |
280 | if uri.startswith('git://'): | 280 | if uri.startswith('git://'): |
281 | suffix = 'new' | 281 | suffix = 'new' |
diff --git a/scripts/lib/recipetool/append.py b/scripts/lib/recipetool/append.py index 69c8bb77a0..3f2c134ad5 100644 --- a/scripts/lib/recipetool/append.py +++ b/scripts/lib/recipetool/append.py | |||
@@ -238,7 +238,7 @@ def appendfile(args): | |||
238 | if stdout: | 238 | if stdout: |
239 | logger.debug('file command output: %s' % stdout.rstrip()) | 239 | logger.debug('file command output: %s' % stdout.rstrip()) |
240 | if ('executable' in stdout and not 'shell script' in stdout) or 'shared object' in stdout: | 240 | if ('executable' in stdout and not 'shell script' in stdout) or 'shared object' in stdout: |
241 | logger.warn('This file looks like it is a binary or otherwise the output of compilation. If it is, you should consider building it properly instead of substituting a binary file directly.') | 241 | logger.warning('This file looks like it is a binary or otherwise the output of compilation. If it is, you should consider building it properly instead of substituting a binary file directly.') |
242 | 242 | ||
243 | if args.recipe: | 243 | if args.recipe: |
244 | recipes = {args.targetpath: [args.recipe],} | 244 | recipes = {args.targetpath: [args.recipe],} |
@@ -275,7 +275,7 @@ def appendfile(args): | |||
275 | if selectpn: | 275 | if selectpn: |
276 | logger.debug('Selecting recipe %s for file %s' % (selectpn, args.targetpath)) | 276 | logger.debug('Selecting recipe %s for file %s' % (selectpn, args.targetpath)) |
277 | if postinst_pns: | 277 | if postinst_pns: |
278 | logger.warn('%s be modified by postinstall scripts for the following recipes:\n %s\nThis may or may not be an issue depending on what modifications these postinstall scripts make.' % (args.targetpath, '\n '.join(postinst_pns))) | 278 | logger.warning('%s be modified by postinstall scripts for the following recipes:\n %s\nThis may or may not be an issue depending on what modifications these postinstall scripts make.' % (args.targetpath, '\n '.join(postinst_pns))) |
279 | rd = _parse_recipe(selectpn, tinfoil) | 279 | rd = _parse_recipe(selectpn, tinfoil) |
280 | if not rd: | 280 | if not rd: |
281 | # Error message already shown | 281 | # Error message already shown |
@@ -286,12 +286,12 @@ def appendfile(args): | |||
286 | sourcetype, sourcepath = sourcefile.split('://', 1) | 286 | sourcetype, sourcepath = sourcefile.split('://', 1) |
287 | logger.debug('Original source file is %s (%s)' % (sourcepath, sourcetype)) | 287 | logger.debug('Original source file is %s (%s)' % (sourcepath, sourcetype)) |
288 | if sourcetype == 'patch': | 288 | if sourcetype == 'patch': |
289 | logger.warn('File %s is added by the patch %s - you may need to remove or replace this patch in order to replace the file.' % (args.targetpath, sourcepath)) | 289 | logger.warning('File %s is added by the patch %s - you may need to remove or replace this patch in order to replace the file.' % (args.targetpath, sourcepath)) |
290 | sourcepath = None | 290 | sourcepath = None |
291 | else: | 291 | else: |
292 | logger.debug('Unable to determine source file, proceeding anyway') | 292 | logger.debug('Unable to determine source file, proceeding anyway') |
293 | if modpatches: | 293 | if modpatches: |
294 | logger.warn('File %s is modified by the following patches:\n %s' % (args.targetpath, '\n '.join(modpatches))) | 294 | logger.warning('File %s is modified by the following patches:\n %s' % (args.targetpath, '\n '.join(modpatches))) |
295 | 295 | ||
296 | if instelements and sourcepath: | 296 | if instelements and sourcepath: |
297 | install = None | 297 | install = None |
@@ -343,7 +343,7 @@ def appendsrc(args, files, rd, extralines=None): | |||
343 | if rd.getVar('S') == rd.getVar('STAGING_KERNEL_DIR'): | 343 | if rd.getVar('S') == rd.getVar('STAGING_KERNEL_DIR'): |
344 | srcdir = os.path.join(workdir, 'git') | 344 | srcdir = os.path.join(workdir, 'git') |
345 | if not bb.data.inherits_class('kernel-yocto', rd): | 345 | if not bb.data.inherits_class('kernel-yocto', rd): |
346 | logger.warn('S == STAGING_KERNEL_DIR and non-kernel-yocto, unable to determine path to srcdir, defaulting to ${WORKDIR}/git') | 346 | logger.warning('S == STAGING_KERNEL_DIR and non-kernel-yocto, unable to determine path to srcdir, defaulting to ${WORKDIR}/git') |
347 | src_destdir = os.path.join(os.path.relpath(srcdir, workdir), src_destdir) | 347 | src_destdir = os.path.join(os.path.relpath(srcdir, workdir), src_destdir) |
348 | src_destdir = os.path.normpath(src_destdir) | 348 | src_destdir = os.path.normpath(src_destdir) |
349 | 349 | ||
@@ -357,9 +357,9 @@ def appendsrc(args, files, rd, extralines=None): | |||
357 | if simple_str in simplified: | 357 | if simple_str in simplified: |
358 | existing = simplified[simple_str] | 358 | existing = simplified[simple_str] |
359 | if source_uri != existing: | 359 | if source_uri != existing: |
360 | logger.warn('{0!r} is already in SRC_URI, with different parameters: {1!r}, not adding'.format(source_uri, existing)) | 360 | logger.warning('{0!r} is already in SRC_URI, with different parameters: {1!r}, not adding'.format(source_uri, existing)) |
361 | else: | 361 | else: |
362 | logger.warn('{0!r} is already in SRC_URI, not adding'.format(source_uri)) | 362 | logger.warning('{0!r} is already in SRC_URI, not adding'.format(source_uri)) |
363 | else: | 363 | else: |
364 | extralines.append('SRC_URI += {0}'.format(source_uri)) | 364 | extralines.append('SRC_URI += {0}'.format(source_uri)) |
365 | copyfiles[newfile] = srcfile | 365 | copyfiles[newfile] = srcfile |
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py index a3710285bb..1810c70ae2 100644 --- a/scripts/lib/recipetool/create.py +++ b/scripts/lib/recipetool/create.py | |||
@@ -98,7 +98,7 @@ class RecipeHandler(object): | |||
98 | break | 98 | break |
99 | except IOError as ioe: | 99 | except IOError as ioe: |
100 | if ioe.errno == 2: | 100 | if ioe.errno == 2: |
101 | logger.warn('unable to find a pkgdata file for package %s' % pkg) | 101 | logger.warning('unable to find a pkgdata file for package %s' % pkg) |
102 | else: | 102 | else: |
103 | raise | 103 | raise |
104 | 104 | ||
@@ -437,7 +437,7 @@ def create_recipe(args): | |||
437 | if scriptutils.is_src_url(source): | 437 | if scriptutils.is_src_url(source): |
438 | # Warn about github archive URLs | 438 | # Warn about github archive URLs |
439 | if re.match('https?://github.com/[^/]+/[^/]+/archive/.+(\.tar\..*|\.zip)$', source): | 439 | if re.match('https?://github.com/[^/]+/[^/]+/archive/.+(\.tar\..*|\.zip)$', source): |
440 | logger.warn('github archive files are not guaranteed to be stable and may be re-generated over time. If the latter occurs, the checksums will likely change and the recipe will fail at do_fetch. It is recommended that you point to an actual commit or tag in the repository instead (using the repository URL in conjunction with the -S/--srcrev option).') | 440 | logger.warning('github archive files are not guaranteed to be stable and may be re-generated over time. If the latter occurs, the checksums will likely change and the recipe will fail at do_fetch. It is recommended that you point to an actual commit or tag in the repository instead (using the repository URL in conjunction with the -S/--srcrev option).') |
441 | # Fetch a URL | 441 | # Fetch a URL |
442 | fetchuri = reformat_git_uri(urldefrag(source)[0]) | 442 | fetchuri = reformat_git_uri(urldefrag(source)[0]) |
443 | if args.binary: | 443 | if args.binary: |
diff --git a/scripts/lib/recipetool/create_kmod.py b/scripts/lib/recipetool/create_kmod.py index 4569b53c80..3982537a4e 100644 --- a/scripts/lib/recipetool/create_kmod.py +++ b/scripts/lib/recipetool/create_kmod.py | |||
@@ -141,7 +141,7 @@ class KernelModuleRecipeHandler(RecipeHandler): | |||
141 | warnmsg = 'Unable to find means of passing kernel path into install makefile - if kernel path is hardcoded you will need to patch the makefile' | 141 | warnmsg = 'Unable to find means of passing kernel path into install makefile - if kernel path is hardcoded you will need to patch the makefile' |
142 | if warnmsg: | 142 | if warnmsg: |
143 | warnmsg += '. Note that the variable KERNEL_SRC will be passed in as the kernel source path.' | 143 | warnmsg += '. Note that the variable KERNEL_SRC will be passed in as the kernel source path.' |
144 | logger.warn(warnmsg) | 144 | logger.warning(warnmsg) |
145 | lines_after.append('# %s' % warnmsg) | 145 | lines_after.append('# %s' % warnmsg) |
146 | 146 | ||
147 | return True | 147 | return True |
diff --git a/scripts/lib/recipetool/create_npm.py b/scripts/lib/recipetool/create_npm.py index bb42a5ca5c..03667887fc 100644 --- a/scripts/lib/recipetool/create_npm.py +++ b/scripts/lib/recipetool/create_npm.py | |||
@@ -90,7 +90,7 @@ class NpmRecipeHandler(RecipeHandler): | |||
90 | runenv = dict(os.environ, PATH=d.getVar('PATH')) | 90 | runenv = dict(os.environ, PATH=d.getVar('PATH')) |
91 | bb.process.run('npm shrinkwrap', cwd=srctree, stderr=subprocess.STDOUT, env=runenv, shell=True) | 91 | bb.process.run('npm shrinkwrap', cwd=srctree, stderr=subprocess.STDOUT, env=runenv, shell=True) |
92 | except bb.process.ExecutionError as e: | 92 | except bb.process.ExecutionError as e: |
93 | logger.warn('npm shrinkwrap failed:\n%s' % e.stdout) | 93 | logger.warning('npm shrinkwrap failed:\n%s' % e.stdout) |
94 | return | 94 | return |
95 | 95 | ||
96 | tmpfile = os.path.join(localfilesdir, 'npm-shrinkwrap.json') | 96 | tmpfile = os.path.join(localfilesdir, 'npm-shrinkwrap.json') |
@@ -107,12 +107,12 @@ class NpmRecipeHandler(RecipeHandler): | |||
107 | cwd=srctree, stderr=subprocess.STDOUT, env=runenv, shell=True) | 107 | cwd=srctree, stderr=subprocess.STDOUT, env=runenv, shell=True) |
108 | relockbin = os.path.join(NpmRecipeHandler.lockdownpath, 'node_modules', 'lockdown', 'relock.js') | 108 | relockbin = os.path.join(NpmRecipeHandler.lockdownpath, 'node_modules', 'lockdown', 'relock.js') |
109 | if not os.path.exists(relockbin): | 109 | if not os.path.exists(relockbin): |
110 | logger.warn('Could not find relock.js within lockdown directory; skipping lockdown') | 110 | logger.warning('Could not find relock.js within lockdown directory; skipping lockdown') |
111 | return | 111 | return |
112 | try: | 112 | try: |
113 | bb.process.run('node %s' % relockbin, cwd=srctree, stderr=subprocess.STDOUT, env=runenv, shell=True) | 113 | bb.process.run('node %s' % relockbin, cwd=srctree, stderr=subprocess.STDOUT, env=runenv, shell=True) |
114 | except bb.process.ExecutionError as e: | 114 | except bb.process.ExecutionError as e: |
115 | logger.warn('lockdown-relock failed:\n%s' % e.stdout) | 115 | logger.warning('lockdown-relock failed:\n%s' % e.stdout) |
116 | return | 116 | return |
117 | 117 | ||
118 | tmpfile = os.path.join(localfilesdir, 'lockdown.json') | 118 | tmpfile = os.path.join(localfilesdir, 'lockdown.json') |
diff --git a/scripts/lib/recipetool/newappend.py b/scripts/lib/recipetool/newappend.py index decce83fac..76707b4c91 100644 --- a/scripts/lib/recipetool/newappend.py +++ b/scripts/lib/recipetool/newappend.py | |||
@@ -58,11 +58,11 @@ def newappend(args): | |||
58 | return 1 | 58 | return 1 |
59 | 59 | ||
60 | if not path_ok: | 60 | if not path_ok: |
61 | logger.warn('Unable to determine correct subdirectory path for bbappend file - check that what %s adds to BBFILES also matches .bbappend files. Using %s for now, but until you fix this the bbappend will not be applied.', os.path.join(args.destlayer, 'conf', 'layer.conf'), os.path.dirname(append_path)) | 61 | logger.warning('Unable to determine correct subdirectory path for bbappend file - check that what %s adds to BBFILES also matches .bbappend files. Using %s for now, but until you fix this the bbappend will not be applied.', os.path.join(args.destlayer, 'conf', 'layer.conf'), os.path.dirname(append_path)) |
62 | 62 | ||
63 | layerdirs = [os.path.abspath(layerdir) for layerdir in rd.getVar('BBLAYERS').split()] | 63 | layerdirs = [os.path.abspath(layerdir) for layerdir in rd.getVar('BBLAYERS').split()] |
64 | if not os.path.abspath(args.destlayer) in layerdirs: | 64 | if not os.path.abspath(args.destlayer) in layerdirs: |
65 | logger.warn('Specified layer is not currently enabled in bblayers.conf, you will need to add it before this bbappend will be active') | 65 | logger.warning('Specified layer is not currently enabled in bblayers.conf, you will need to add it before this bbappend will be active') |
66 | 66 | ||
67 | if not os.path.exists(append_path): | 67 | if not os.path.exists(append_path): |
68 | bb.utils.mkdirhier(os.path.dirname(append_path)) | 68 | bb.utils.mkdirhier(os.path.dirname(append_path)) |
diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py index f0c5ff0aaf..11dedb8cac 100644 --- a/scripts/lib/wic/engine.py +++ b/scripts/lib/wic/engine.py | |||
@@ -494,7 +494,7 @@ class Disk: | |||
494 | sparse_copy(partfname, target, seek=part['start'] * self._lsector_size) | 494 | sparse_copy(partfname, target, seek=part['start'] * self._lsector_size) |
495 | os.unlink(partfname) | 495 | os.unlink(partfname) |
496 | elif part['type'] != 'f': | 496 | elif part['type'] != 'f': |
497 | logger.warn("skipping partition {}: unsupported fstype {}".format(pnum, fstype)) | 497 | logger.warning("skipping partition {}: unsupported fstype {}".format(pnum, fstype)) |
498 | 498 | ||
499 | def wic_ls(args, native_sysroot): | 499 | def wic_ls(args, native_sysroot): |
500 | """List contents of partitioned image or vfat partition.""" | 500 | """List contents of partitioned image or vfat partition.""" |
diff --git a/scripts/runqemu b/scripts/runqemu index 73d7d5818b..f52b9a82ea 100755 --- a/scripts/runqemu +++ b/scripts/runqemu | |||
@@ -286,7 +286,7 @@ class BaseConfig(object): | |||
286 | def check_arg_fstype(self, fst): | 286 | def check_arg_fstype(self, fst): |
287 | """Check and set FSTYPE""" | 287 | """Check and set FSTYPE""" |
288 | if fst not in self.fstypes + self.vmtypes: | 288 | if fst not in self.fstypes + self.vmtypes: |
289 | logger.warn("Maybe unsupported FSTYPE: %s" % fst) | 289 | logger.warning("Maybe unsupported FSTYPE: %s" % fst) |
290 | if not self.fstype or self.fstype == fst: | 290 | if not self.fstype or self.fstype == fst: |
291 | if fst == 'ramfs': | 291 | if fst == 'ramfs': |
292 | fst = 'cpio.gz' | 292 | fst = 'cpio.gz' |
@@ -348,7 +348,7 @@ class BaseConfig(object): | |||
348 | self.qemuboot = qb | 348 | self.qemuboot = qb |
349 | self.qbconfload = True | 349 | self.qbconfload = True |
350 | else: | 350 | else: |
351 | logger.warn("%s doesn't exist" % qb) | 351 | logger.warning("%s doesn't exist" % qb) |
352 | else: | 352 | else: |
353 | raise RunQemuError("Can't find FSTYPE from: %s" % p) | 353 | raise RunQemuError("Can't find FSTYPE from: %s" % p) |
354 | 354 | ||
@@ -691,7 +691,7 @@ class BaseConfig(object): | |||
691 | if not self.get('QB_AUDIO_DRV'): | 691 | if not self.get('QB_AUDIO_DRV'): |
692 | raise RunQemuError("QB_AUDIO_DRV is NULL, this board doesn't support audio") | 692 | raise RunQemuError("QB_AUDIO_DRV is NULL, this board doesn't support audio") |
693 | if not self.get('QB_AUDIO_OPT'): | 693 | if not self.get('QB_AUDIO_OPT'): |
694 | logger.warn('QB_AUDIO_OPT is NULL, you may need define it to make audio work') | 694 | logger.warning('QB_AUDIO_OPT is NULL, you may need define it to make audio work') |
695 | else: | 695 | else: |
696 | self.qemu_opt_script += ' %s' % self.get('QB_AUDIO_OPT') | 696 | self.qemu_opt_script += ' %s' % self.get('QB_AUDIO_OPT') |
697 | os.putenv('QEMU_AUDIO_DRV', self.get('QB_AUDIO_DRV')) | 697 | os.putenv('QEMU_AUDIO_DRV', self.get('QB_AUDIO_DRV')) |
@@ -713,7 +713,7 @@ class BaseConfig(object): | |||
713 | if self.get('DEPLOY_DIR_IMAGE'): | 713 | if self.get('DEPLOY_DIR_IMAGE'): |
714 | deploy_dir_image = self.get('DEPLOY_DIR_IMAGE') | 714 | deploy_dir_image = self.get('DEPLOY_DIR_IMAGE') |
715 | else: | 715 | else: |
716 | logger.warn("Can't find qemuboot conf file, DEPLOY_DIR_IMAGE is NULL!") | 716 | logger.warning("Can't find qemuboot conf file, DEPLOY_DIR_IMAGE is NULL!") |
717 | return | 717 | return |
718 | 718 | ||
719 | if self.rootfs and not os.path.exists(self.rootfs): | 719 | if self.rootfs and not os.path.exists(self.rootfs): |
@@ -1060,9 +1060,9 @@ class BaseConfig(object): | |||
1060 | # virtio might have been selected explicitly (just use it), or | 1060 | # virtio might have been selected explicitly (just use it), or |
1061 | # is used as fallback (then warn about that). | 1061 | # is used as fallback (then warn about that). |
1062 | if not drive_type.startswith("/dev/vd"): | 1062 | if not drive_type.startswith("/dev/vd"): |
1063 | logger.warn("Unknown QB_DRIVE_TYPE: %s" % drive_type) | 1063 | logger.warning("Unknown QB_DRIVE_TYPE: %s" % drive_type) |
1064 | logger.warn("Failed to figure out drive type, consider define or fix QB_DRIVE_TYPE") | 1064 | logger.warning("Failed to figure out drive type, consider define or fix QB_DRIVE_TYPE") |
1065 | logger.warn('Trying to use virtio block drive') | 1065 | logger.warning('Trying to use virtio block drive') |
1066 | vm_drive = '-drive if=virtio,file=%s,format=%s' % (self.rootfs, rootfs_format) | 1066 | vm_drive = '-drive if=virtio,file=%s,format=%s' % (self.rootfs, rootfs_format) |
1067 | 1067 | ||
1068 | # All branches above set vm_drive. | 1068 | # All branches above set vm_drive. |
@@ -1266,7 +1266,7 @@ class BaseConfig(object): | |||
1266 | self.bitbake_e = subprocess.check_output(cmd, shell=True).decode('utf-8') | 1266 | self.bitbake_e = subprocess.check_output(cmd, shell=True).decode('utf-8') |
1267 | except subprocess.CalledProcessError as err: | 1267 | except subprocess.CalledProcessError as err: |
1268 | self.bitbake_e = '' | 1268 | self.bitbake_e = '' |
1269 | logger.warn("Couldn't run 'bitbake -e' to gather environment information:\n%s" % err.output.decode('utf-8')) | 1269 | logger.warning("Couldn't run 'bitbake -e' to gather environment information:\n%s" % err.output.decode('utf-8')) |
1270 | 1270 | ||
1271 | def validate_combos(self): | 1271 | def validate_combos(self): |
1272 | if (self.fstype in self.vmtypes) and self.kernel: | 1272 | if (self.fstype in self.vmtypes) and self.kernel: |