From nobody Tue Feb 10 15:45:24 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621251353; cv=none; d=zohomail.com; s=zohoarc; b=Nvy5wbUk0bbz+H+4Q1NUHWUyc/1rZT1oNavXHSUXDHUIz8ud+ov9FTKjb89vG3sjBiPgEbnlkSkibL2B+PnSUrvddTqeMHhQWItFNCBC00ye6G419+cLMfbnbX1jEChK5t/1jcQAreQjdpZMS6PoGPXsPPbJmlLcqt5+h/mcxeQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621251353; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=c8bOmXolEevsgY06RDp1x37gAVlf6gEYuUYZ/EsTATU=; b=T3KHYEzmOheqiS6wa3S8ZvwOYpRgL8p3aMn0ywj/PbDhpXbjAR/lIkJOr4tCml8o/gwAWr3rm+y+bMwulRSTQyn6JnO7yLyBzuufsJ8D/m/akQSXvN50qdLldTpQnnAlA65sxzcDcxN8sHQb9/T7rfcrEvDqv7KV29jBxl4gV5s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1621251353895846.7078792799875; Mon, 17 May 2021 04:35:53 -0700 (PDT) Received: from localhost ([::1]:60482 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1libXM-0006Tr-QE for importer@patchew.org; Mon, 17 May 2021 07:35:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35910) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1libIN-00062w-8M for qemu-devel@nongnu.org; Mon, 17 May 2021 07:20:23 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:35623) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1libIA-0006LV-GR for qemu-devel@nongnu.org; Mon, 17 May 2021 07:20:23 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-117-eYi0EHDoOpKokYY-Pwf9NA-1; Mon, 17 May 2021 07:20:03 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7CE4A80ED9E for ; Mon, 17 May 2021 11:20:02 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 49AB019726 for ; Mon, 17 May 2021 11:20:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621250406; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=c8bOmXolEevsgY06RDp1x37gAVlf6gEYuUYZ/EsTATU=; b=B/2HmtX41k6BplwZo5q0NrJe0pglxlSWc+QumxyZj60nM44jv73BP5tldUJfHzuxO+tNcM bonH+mAmoZw4S2ibyVeYQNV8LpxSq1OyQp6j/iYqYdjxTkU9ktoOGxh/UE1ErzzMlAOsvx GEwVtM+3c60hltl1KQVJPDN7zbomWlg= X-MC-Unique: eYi0EHDoOpKokYY-Pwf9NA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 02/20] configure: check for submodules if --with-git-submodules=ignore Date: Mon, 17 May 2021 07:19:43 -0400 Message-Id: <20210517112001.2564006-3-pbonzini@redhat.com> In-Reply-To: <20210517112001.2564006-1-pbonzini@redhat.com> References: <20210517112001.2564006-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.374, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Right now --with-git-submodules=3Dignore has a subtle difference from just running without a .git directory, in that it does not check that submodule sources actually exist. Move the check for ui/keycodemapdb/README so that it happens even if the user specified --with-git-submodules=3Dignore, with a customized error message that is more suitable for this situation. Signed-off-by: Paolo Bonzini --- configure | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/configure b/configure index 1bb29fcda1..4681cbe2d7 100755 --- a/configure +++ b/configure @@ -260,24 +260,6 @@ then else git_submodules_action=3D"ignore" git_submodules=3D"" - - if ! test -f "$source_path/ui/keycodemapdb/README" - then - echo - echo "ERROR: missing file $source_path/ui/keycodemapdb/README" - echo - echo "This is not a GIT checkout but module content appears to" - echo "be missing. Do not use 'git archive' or GitHub download link= s" - echo "to acquire QEMU source archives. Non-GIT builds are only" - echo "supported with source archives linked from:" - echo - echo " https://www.qemu.org/download/#source" - echo - echo "Developers working with GIT can use scripts/archive-source.s= h" - echo "if they need to create valid source archives." - echo - exit 1 - fi fi git=3D"git" =20 @@ -1582,6 +1564,28 @@ case $git_submodules_action in fi ;; ignore) + if ! test -f "$source_path/ui/keycodemapdb/README" + then + echo + echo "ERROR: missing GIT submodules" + echo + if test -e "$source_path/.git"; then + echo "--with-git-submodules=3Dignore specified but submodu= les were not" + echo "checked out. Please initialize and update submodule= s." + else + echo "This is not a GIT checkout but module content appear= s to" + echo "be missing. Do not use 'git archive' or GitHub downl= oad links" + echo "to acquire QEMU source archives. Non-GIT builds are = only" + echo "supported with source archives linked from:" + echo + echo " https://www.qemu.org/download/#source" + echo + echo "Developers working with GIT can use scripts/archive-= source.sh" + echo "if they need to create valid source archives." + fi + echo + exit 1 + fi ;; *) echo "ERROR: invalid --with-git-submodules=3D value '$git_submodul= es_action'" --=20 2.27.0