From patchwork Sun Jul 2 14:26:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1802372 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=HLn9pV0I; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QvBRJ39N9z20Pj for ; Mon, 3 Jul 2023 00:35:08 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 26BB9867F9; Sun, 2 Jul 2023 16:28:52 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="HLn9pV0I"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F039586784; Sun, 2 Jul 2023 16:27:58 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd33.google.com (mail-io1-xd33.google.com [IPv6:2607:f8b0:4864:20::d33]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 15CE386751 for ; Sun, 2 Jul 2023 16:27:50 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd33.google.com with SMTP id ca18e2360f4ac-783544a1c90so191301139f.1 for ; Sun, 02 Jul 2023 07:27:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1688308068; x=1690900068; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MGN8ONa5Ed3L63Mmx4csUE55Vqza1DCu9qLA3WTJpBg=; b=HLn9pV0IKRG++2a8Jr1Gs5aUsOCDZ9yLvdd/rsAQlladPjPEC93p0/Aum3UQcBzvhD rfKmZNVQuMRdSF7jOw8+HgUUc1Yxw8AaoyE6YUzZ+5LloHzr0UznKqTv24xaXqinpZzU o7Qi9ZcWrdJwodO4JZAjUiqu6ymr5JGOs76vs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688308068; x=1690900068; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MGN8ONa5Ed3L63Mmx4csUE55Vqza1DCu9qLA3WTJpBg=; b=fkNy+/3cCI47akBGlTuknuql1eqiOz/e+lSD6658daZg0vuaxpMVr3rIjAtXkczzpA wumcSOgVKLvlP95qf7aIY8LlEbO+oz+X8+p5pgNg0K9f5vlXudXsO+Vy29ZG48CjGyH4 L4T9iuhd2wVBLlj0E4IQCzFQD0ftDMpkTu9gUWu7KtsbH0l9ZxS6qMsmhdh91EzOP2sq tvS/eqZP/K2mg8ayA4gVqISwlaGU9hSnNEHqSZ3ESoXugPRr/YSKyWPFQNEJnl3J30vO dgDuRRW6moeq+i5Kp1B+1r30Pd+tDIcAvLnYyB+MWgWVS2bRFF7EIQfDK2lkIXYAZ/zZ 6wxQ== X-Gm-Message-State: AC+VfDwVpwV/0LkYaJMgM4wqmH28/V57kPdrpyPxF0zKz5BbkwkoCNhC WHyjUjQynUwNA3F7Bwh8//gOlRrzkRrcHROLIM0= X-Google-Smtp-Source: ACHHUZ6i9lhXLKTe22P7XTdf9ACDRoxWwZC0fi25MqABQLFzeZpAL/COXyTpeVvGQbPrVq62VOTGKw== X-Received: by 2002:a05:6602:2146:b0:780:bf50:32c9 with SMTP id y6-20020a056602214600b00780bf5032c9mr9147645ioy.15.1688308068734; Sun, 02 Jul 2023 07:27:48 -0700 (PDT) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id c13-20020a02c9cd000000b0042af5268e4asm2934713jap.58.2023.07.02.07.27.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jul 2023 07:27:48 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Simon Glass Subject: [PATCH 44/58] buildman: Start a function to set up the make arguments Date: Sun, 2 Jul 2023 15:26:09 +0100 Message-ID: <20230702142639.1249681-45-sjg@chromium.org> X-Mailer: git-send-email 2.41.0.255.g8b1d071c50-goog In-Reply-To: <20230702142639.1249681-1-sjg@chromium.org> References: <20230702142639.1249681-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Move some of this code into a new funciion, to help reduce the size of the run_commits() function. Signed-off-by: Simon Glass --- tools/buildman/builderthread.py | 38 ++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/tools/buildman/builderthread.py b/tools/buildman/builderthread.py index ad12e9ede7f4..47ebf4dcdd90 100644 --- a/tools/buildman/builderthread.py +++ b/tools/buildman/builderthread.py @@ -137,6 +137,28 @@ class BuilderThread(threading.Thread): return self.builder.do_make(commit, brd, stage, cwd, *args, **kwargs) + def _build_args(self, args): + """Set up arguments to the args list based on the settings + + Args: + args (list of str): List of string arguments to add things to + """ + if self.builder.verbose_build: + args.append('V=1') + else: + args.append('-s') + if self.builder.num_jobs is not None: + args.extend(['-j', str(self.builder.num_jobs)]) + if self.builder.warnings_as_errors: + args.append('KCFLAGS=-Werror') + args.append('HOSTCFLAGS=-Werror') + if self.builder.allow_missing: + args.append('BINMAN_ALLOW_MISSING=1') + if self.builder.no_lto: + args.append('NO_LTO=1') + if self.builder.reproducible_builds: + args.append('SOURCE_DATE_EPOCH=0') + def run_commit(self, commit_upto, brd, work_dir, do_config, config_only, force_build, force_build_failures, work_in_output, adjust_cfg): @@ -252,21 +274,7 @@ class BuilderThread(threading.Thread): src_dir = os.getcwd() else: args.append(f'O={out_rel_dir}') - if self.builder.verbose_build: - args.append('V=1') - else: - args.append('-s') - if self.builder.num_jobs is not None: - args.extend(['-j', str(self.builder.num_jobs)]) - if self.builder.warnings_as_errors: - args.append('KCFLAGS=-Werror') - args.append('HOSTCFLAGS=-Werror') - if self.builder.allow_missing: - args.append('BINMAN_ALLOW_MISSING=1') - if self.builder.no_lto: - args.append('NO_LTO=1') - if self.builder.reproducible_builds: - args.append('SOURCE_DATE_EPOCH=0') + self._build_args(args) config_args = [f'{brd.target}_defconfig'] config_out = '' args.extend(self.builder.toolchains.GetMakeArguments(brd))