From patchwork Mon May 24 16:41:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 12276649 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3FA1BC04FF3 for ; Mon, 24 May 2021 17:02:40 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E07CC6140A for ; Mon, 24 May 2021 17:02:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E07CC6140A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48636 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llDyQ-0004px-SC for qemu-devel@archiver.kernel.org; Mon, 24 May 2021 13:02:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45096) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llDeK-0004jI-OX for qemu-devel@nongnu.org; Mon, 24 May 2021 12:41:53 -0400 Received: from mail-ej1-x631.google.com ([2a00:1450:4864:20::631]:42840) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1llDeI-0004LB-Em for qemu-devel@nongnu.org; Mon, 24 May 2021 12:41:52 -0400 Received: by mail-ej1-x631.google.com with SMTP id lg14so42763877ejb.9 for ; Mon, 24 May 2021 09:41:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XYlIy29CAzsIXn+NuTHdzNwJB0PZQ/8OlU0zYweURUw=; b=hNS95ZkktK1O3RqVjEyvbJ8PBs8RvofKVZehbU11tRrw2ncopnG2ZyQONRI4hCDJbs QVvr5YPCWO4/7rZCU+n9YnCvxthy9rZvU1ivze2jlNQg4jNhzrssOENPEgOO820sYbGD LCivuJmBXH5jw0CnbAlGB7OVtUCTnWIxRf2xaOfNyrJYEJwTx8AFdgiAX4vlp38+4vbr 6Y+G8nxd+fgYddlGcFlO1Dqqd+UMg/4RfNKRTXLxb8p8n/d4ak/C93hO546yJ0EN5oRI Xi4cA0LkLF1ez/0BcBoPROc2/nGjF4IVnCRSHSfZhqVBdkdrCYaLehmeg1RXONPDPNkj OkHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=XYlIy29CAzsIXn+NuTHdzNwJB0PZQ/8OlU0zYweURUw=; b=D6KiybS8tGlf/RkSTO0gH1rIKM1ML8KZO4gQlvIdzBYp8PCl1ZLMo+aVcXn0eWuRgq prJYpBBXwd2vagSLFU1o6Zyv701P4ED9wo61SWwf0pRSeprUbGsPkuVOlUjWlFQNbzxP brYN4pxVdpDkn3wmhibv9lYQdGGB+cfVPoKV/tNIGFB8Rq+065YiSOIIkk7PrBdpIwHt SzWz3RXCl9ZRylMBtQlDVgl5Ca7T26t8AezY+TNtw5T7/WDzxU4WM1xxPBNBsZrLIp6V Qv+JdK9gM6jLW271W1B89xZoHkpKyG7lcXHyjo6UWAkYpxHIGAKw+cjSj8bzWS1pzOr8 KcgQ== X-Gm-Message-State: AOAM5307lQzxchQ//3r7Yr7VO+O4gDedcuAb7l4jwiWCZp8Mnos7pBEX N5XS7+yoi8chnP4p01dYkcIn9jaErQ6VKw== X-Google-Smtp-Source: ABdhPJyYKwnD95jW0OCBRnd5fGiY5+qWQvVoTLt2sKtDDIBmrPCEhfgwEHv/pTrsOrLtQyFdctREtw== X-Received: by 2002:a17:906:7f0d:: with SMTP id d13mr24531044ejr.60.1621874494288; Mon, 24 May 2021 09:41:34 -0700 (PDT) Received: from avogadro.redhat.com ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id g4sm9581922edm.83.2021.05.24.09.41.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 May 2021 09:41:33 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 03/28] configure: simplify assignment to GIT_SUBMODULES Date: Mon, 24 May 2021 18:41:06 +0200 Message-Id: <20210524164131.383778-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210524164131.383778-1-pbonzini@redhat.com> References: <20210524164131.383778-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::631; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x631.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Do not guard each assignment with a check for --with-git-submodules=ignore. To avoid a confusing "GIT" line from the Makefile, guard the git-submodule-update recipe so that it is empty when --with-git-submodules=ignore. Signed-off-by: Paolo Bonzini --- Makefile | 2 ++ configure | 20 ++++++-------------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 4cab10a2a4..30f19d33bb 100644 --- a/Makefile +++ b/Makefile @@ -48,9 +48,11 @@ Makefile: .git-submodule-status .PHONY: git-submodule-update git-submodule-update: +ifneq ($(GIT_SUBMODULES_ACTION),ignore) $(call quiet-command, \ (GIT="$(GIT)" "$(SRC_PATH)/scripts/git-submodule.sh" $(GIT_SUBMODULES_ACTION) $(GIT_SUBMODULES)), \ "GIT","$(GIT_SUBMODULES)") +endif # 0. ensure the build tree is okay diff --git a/configure b/configure index f32c6f1a26..cca532bb0c 100755 --- a/configure +++ b/configure @@ -256,11 +256,11 @@ gdb_bin=$(command -v "gdb-multiarch" || command -v "gdb") if test -e "$source_path/.git" then git_submodules_action="update" - git_submodules="ui/keycodemapdb" else git_submodules_action="ignore" - git_submodules="" fi + +git_submodules="ui/keycodemapdb" git="git" # Don't accept a target_list environment variable. @@ -3627,9 +3627,7 @@ fi case "$fdt" in auto | enabled | internal) # Simpler to always update submodule, even if not needed. - if test "$git_submodules_action" != "ignore"; then - git_submodules="${git_submodules} dtc" - fi + git_submodules="${git_submodules} dtc" ;; esac @@ -4351,9 +4349,7 @@ fi case "$capstone" in auto | enabled | internal) # Simpler to always update submodule, even if not needed. - if test "$git_submodules_action" != "ignore"; then - git_submodules="${git_submodules} capstone" - fi + git_submodules="${git_submodules} capstone" ;; esac @@ -5283,9 +5279,7 @@ fi case "$slirp" in auto | enabled | internal) # Simpler to always update submodule, even if not needed. - if test "$git_submodules_action" != "ignore"; then - git_submodules="${git_submodules} slirp" - fi + git_submodules="${git_submodules} slirp" ;; esac @@ -5477,9 +5471,7 @@ if test "$cpu" = "s390x" ; then roms="$roms s390-ccw" # SLOF is required for building the s390-ccw firmware on s390x, # since it is using the libnet code from SLOF for network booting. - if test "$git_submodules_action" != "ignore"; then - git_submodules="${git_submodules} roms/SLOF" - fi + git_submodules="${git_submodules} roms/SLOF" fi fi