From: Samuel Martin <s.martin49@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [autobuild 3/4] autobuild-run: sanitize make options
Date: Sun, 12 Apr 2015 16:34:44 +0200 [thread overview]
Message-ID: <1428849285-21092-3-git-send-email-s.martin49@gmail.com> (raw)
In-Reply-To: <1428849285-21092-1-git-send-email-s.martin49@gmail.com>
So far, --make-opts allows the user to override any make option or
variable, especially '-C' and 'O=' which should not in the autobuild
context.
So, this change drop '-C' option and 'O=' and 'BR2_JLEVEL=' variables
from the --make-opts arguments.
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
scripts/autobuild-run | 37 ++++++++++++++++++++++++++++++++++++-
1 file changed, 36 insertions(+), 1 deletion(-)
diff --git a/scripts/autobuild-run b/scripts/autobuild-run
index a7cdc12..dbfc33e 100755
--- a/scripts/autobuild-run
+++ b/scripts/autobuild-run
@@ -773,6 +773,40 @@ def merge(dict_1, dict_2):
return dict((str(key), dict_1.get(key) or dict_2.get(key))
for key in set(dict_2) | set(dict_1))
+def sanitize_make_opts(make_opts):
+ """ sanitize make options
+
+ - do not allow to override '-C' option
+ - do not allow to user deifined 'O=' and 'BR2_JLEVEL='
+ - print log when overloading 'BR2_DL_DIR='
+
+ Return the sanitized make options string.
+ """
+ make_opts = make_opts.split(" ")
+ for i, arg in enumerate(make_opts):
+ if arg.startswith("-C"):
+ # remove both '-C<path>' and '-C' arguments
+ warn = "WARN: sanitizing make-opts (removing arguments '%s" % arg
+ make_opts.remove(arg)
+ if arg == '-C':
+ # remove '<path>' in case of '-C <path>'
+ # (no need for incrementing i since make_opts[i] already points
+ # to '<path>' after arg (i.e. '-C') has been removed
+ warn += " %s" % make_opts[i]
+ make_opts.remove(make_opts[i])
+ warn += "')"
+ print(warn)
+ elif "=" in arg:
+ var = arg.split("=", 1)[0]
+ if var in ("BR2_DL_DIR",):
+ print("INFO: using user defined '%s' (%s)" % (var, arg))
+ elif var in ("BR2_JLEVEL", "O",):
+ warn = "WARN: sanitizing make variable (removing arguments '%s')" % arg
+ make_opts.remove(arg)
+ print(warn)
+ return " ".join(make_opts)
+
+
def main():
# Avoid locale settings of autobuilder machine leaking in, for example
@@ -833,6 +867,7 @@ def main():
sys.exit(1)
buildpid = multiprocessing.Array('i', int(args['--ninstances']))
+ make_opts = sanitize_make_opts(args['--make-opts'])
processes = []
for i in range(0, int(args['--ninstances'])):
p = multiprocessing.Process(target=run_instance, kwargs=dict(
@@ -842,7 +877,7 @@ def main():
http_login = args['--http-login'],
http_password = args['--http-password'],
submitter = args['--submitter'],
- make_opts = args['--make-opts'],
+ make_opts = make_opts,
upload = upload,
buildpid = buildpid
))
--
2.3.5
next prev parent reply other threads:[~2015-04-12 14:34 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-12 14:34 [Buildroot] [autobuild 1/4] autobuild-run: prevent send_result from failing when gathering config files Samuel Martin
2015-04-12 14:34 ` [Buildroot] [autobuild 2/4] autobuild-run: also save CMake config log files on package failure Samuel Martin
2015-04-12 14:34 ` Samuel Martin [this message]
2015-04-12 17:22 ` [Buildroot] [autobuild 3/4] autobuild-run: sanitize make options Thomas Petazzoni
2015-04-12 18:20 ` Samuel Martin
2015-04-12 14:34 ` [Buildroot] [autobuild 4/4] autobuild-run: allow to change default git uri and branch through env. vars Samuel Martin
2015-04-12 17:26 ` Thomas Petazzoni
2015-04-12 18:06 ` Samuel Martin
2015-04-13 12:34 ` Matthew Weber
2015-04-12 17:20 ` [Buildroot] [autobuild 1/4] autobuild-run: prevent send_result from failing when gathering config files Thomas Petazzoni
2015-04-12 18:15 ` Samuel Martin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1428849285-21092-3-git-send-email-s.martin49@gmail.com \
--to=s.martin49@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.