From patchwork Sun Jul 7 05:28:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Atharva Lele X-Patchwork-Id: 1128552 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="prY8fBCp"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45hHFT6xMRz9s8m for ; Sun, 7 Jul 2019 15:29:17 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 223B485E14; Sun, 7 Jul 2019 05:29:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id y+dCaKDOUdq3; Sun, 7 Jul 2019 05:29:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 0B6F485C10; Sun, 7 Jul 2019 05:29:15 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id E31A11BF956 for ; Sun, 7 Jul 2019 05:29:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C8D8A85C10 for ; Sun, 7 Jul 2019 05:29:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kq0LBZ-Vd6ZF for ; Sun, 7 Jul 2019 05:29:11 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by whitealder.osuosl.org (Postfix) with ESMTPS id 475D485EF5 for ; Sun, 7 Jul 2019 05:29:11 +0000 (UTC) Received: by mail-pl1-f196.google.com with SMTP id b3so3220553plr.4 for ; Sat, 06 Jul 2019 22:29:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9hHjyKhUYI9YMqEyOMdWZ8nDZvWj3hjtKrBhVCUUuGE=; b=prY8fBCpyFwsVuYe8iZLJO1lYZRcEdJ/OqXlnecXUsDTO+O9spJGgQ/58fN/8Kqvco So48GP8TuxHhdihX9lhePvxkMkmOHilw3UYsF5+WYAUOYwydzJbW0nYxbnudvccGKFXe RMBuspsS0D0H8CYN4QRxuUfE8NPRWGV8ymxjtPeguqaKLZBpAnDYlKxl8vZbLl1xMmcq We7BUHRfi7L5xuQt38KLOAMv9jDqEvMZ9Z052mBZ+SNRMvWhDhdlE1jASxEQJ4Zk4ZvO u/1Q0O91tIDzlqg9Z0Jcq/sJXEnWpZuj8Haa2FZLUysdPx4NSDo1RQ0IqFhc+HYZ1H8E vr4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9hHjyKhUYI9YMqEyOMdWZ8nDZvWj3hjtKrBhVCUUuGE=; b=SnXvbA2CxpdMv2a1b8W/O8gbLCBgmrxHnrZmZPs2Oqrf5GxuTxWNnU2CDEPsgmb1Wf g1Za+aFL1DnR45h7gyX8fPVbPi/AP7hHT/fI7n1+G54Tdx3bOQ8IVprFgwwB4pP4AUfo wkIus02CfMHgv/z7YgdWlQjdMA64Fua9v4p3/XU/VTI/CFtYW0gZ+7BsF/Q8XHx/RsAt v91+X03Usr75lMFezvobGTzfZOp+I6Faq0J7xqI32FuF+XFBwR41pWVKijUwM3zuWn1T xQmGQXNefxL1Anarw/KrhxssmEv7CgkwfvlhSyLb4lrDzSMTF2gUH0WMk/xv5AKo3R1b LMVA== X-Gm-Message-State: APjAAAVDRzj9pciI3zI9hSIS2xV2HlRSXwbcY96wKrcOQuCWwDXp4AYu Jgo4hu05DpjCo1/P2UOCOw8XO9ooO73VqA== X-Google-Smtp-Source: APXvYqxzzShF3h2qOvh87bNxPtEcef0aRZtSGWwoVg2Z2lQAcz4OllPd5vKWnrT/PQBNYz+wSGZ99Q== X-Received: by 2002:a17:902:2808:: with SMTP id e8mr14450119plb.317.1562477350529; Sat, 06 Jul 2019 22:29:10 -0700 (PDT) Received: from localhost.localdomain ([123.201.194.71]) by smtp.gmail.com with ESMTPSA id j24sm18039214pgg.86.2019.07.06.22.29.08 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sat, 06 Jul 2019 22:29:10 -0700 (PDT) From: Atharva Lele To: buildroot@buildroot.org Date: Sun, 7 Jul 2019 10:58:07 +0530 Message-Id: <20190707052831.9469-7-itsatharva@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190707052831.9469-1-itsatharva@gmail.com> References: <20190707052831.9469-1-itsatharva@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 07/31] autobuild-run: move make_opts from kwargs to Builder class X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Atharva Lele , yann.morin.1998@free.fr, thomas.petazzoni@bootlin.com Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Atharva Lele Acked-by: Arnout Vandecappelle (Essensium/Mind) --- Changes v1 -> v2: - New patch, split accidental squash of niceness move and make_opts move --- scripts/autobuild-run | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/autobuild-run b/scripts/autobuild-run index 426078c..c2d137c 100755 --- a/scripts/autobuild-run +++ b/scripts/autobuild-run @@ -273,7 +273,7 @@ class SystemInfo: class Builder: def __init__(self, instance, njobs, sysinfo, http_url, http_login, http_password, - submitter): + submitter, make_opts): self.instance = instance self.njobs = njobs self.sysinfo = sysinfo @@ -281,6 +281,7 @@ class Builder: self.http_login = http_login self.http_password = http_password self.submitter = submitter + self.make_opts = make_opts def prepare_build(self, **kwargs): """Prepare for the next build of the specified instance @@ -464,7 +465,7 @@ class Builder: "make", "O=%s" % outputdir, "-C", srcdir, "BR2_DL_DIR=%s" % dldir, "BR2_JLEVEL=%s" % self.njobs] \ - + kwargs['make_opts'].split() + + self.make_opts.split() sub = subprocess.Popen(cmd, stdout=f, stderr=f) # Setup hung build monitoring thread @@ -496,7 +497,7 @@ class Builder: cmd = ["make", "O=%s" % outputdir, "-C", srcdir, "BR2_DL_DIR=%s" % dldir, "legal-info"] \ - + kwargs['make_opts'].split() + + self.make_opts.split() ret = subprocess.call(cmd, stdout=f, stderr=f) if ret != 0: log_write(log, "INFO: build failed during legal-info") @@ -858,9 +859,9 @@ def main(): http_url = args['--http-url'], http_login = args['--http-login'], http_password = args['--http-password'], - submitter = args['--submitter']) + submitter = args['--submitter'], + make_opts = (args['--make-opts'] or '')) p = multiprocessing.Process(target=builder.run_instance, kwargs=dict( - make_opts = (args['--make-opts'] or ''), nice = (args['--nice'] or 0), toolchains_csv = args['--toolchains-csv'], repo = args['--repo'],