From nobody Tue Feb 10 14:15:11 2026 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621876641; cv=none; d=zohomail.com; s=zohoarc; b=jGozAXyU6+XuCXYVqH2/da79e7ewaKSeITZHg+P6qcKdvx5146YOs9HUQywPVhZwBOOrvW63/8AAnBOeCcJ2wRMuUVzxdVLpb/aZPTZ2GkppeA2ay7WyfvJN+eAdYXoOhn75Z16t7fW65IA5tWUvx3Plli92QBXO0oT7zUjuhd0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621876641; h=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=iF4RcJLaBA+Tsqd+K4Whv/EKE42LwUvWQnMGDTznbsc=; b=Z7xk+zJAAAksgjDU0llVGF+TkCwb82qq8xeyliB2PNF8Msm/sSeqDYvkiCGYZp+N0wy43vlffRk/0O8s/kJlZ/kQrc0kUxZIZXrAaft7E0PJkwe5e4dtdg4B+NTZwhuKJnZ7FIFNTlpGNLy1ota5+105DLKWikUktLqmV6kNanU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail 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 1621876641643988.6273142585396; Mon, 24 May 2021 10:17:21 -0700 (PDT) Received: from localhost ([::1]:54802 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llECe-00040t-J5 for importer2@patchew.org; Mon, 24 May 2021 13:17:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45224) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llDeQ-0004oa-Dk for qemu-devel@nongnu.org; Mon, 24 May 2021 12:41:58 -0400 Received: from mail-ed1-x530.google.com ([2a00:1450:4864:20::530]:37683) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1llDeI-0004L4-Eo for qemu-devel@nongnu.org; Mon, 24 May 2021 12:41:56 -0400 Received: by mail-ed1-x530.google.com with SMTP id g7so20567875edm.4 for ; 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.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 May 2021 09:41:33 -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=iF4RcJLaBA+Tsqd+K4Whv/EKE42LwUvWQnMGDTznbsc=; b=XEWjRHwqpLjvzxHRFHqoOOmvXTtAWB0aAPxxPb08YRiPpdeMjX8hSDA6/sMMpUR/Ag Rh7GOrHNSieiw53R6J3LC2toscxDn476ybpLYNztGKJ6RVPMrBuFTUF2SXeCG2KdTnzz tRiUdtdTUvKvJ3O3VVsUIa5aPWzDmdjiUVl+vcQyjwjfy8qXJ3/BtjD7stSOFP2e/B8A 38GVtm4SrHDt5J0V/AmZPU2qdTj2PZCXHwyUVRBqUYc4vori0gKChQ53RVJwR9g6hRBU SgXAF/t8jFuP8tuyJuQNAv0Y4O9tPx4eWnaIQ3FRdJntyaRb5gK4S76sO5toBFjBrgj0 Mdqg== 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=iF4RcJLaBA+Tsqd+K4Whv/EKE42LwUvWQnMGDTznbsc=; b=Uj7vHV0W3blm++jT0OMpf6X+5601h0mE21Yo7d6/df/xd4fMhporThlcehVc1IK/Fn 6FpqgjPVtN6XWcu96FXv45+u/ydAHEB37coL4aRlqB9ystCR4rskC5QsBVBhk2OtR+OD biK9kycdkP9XTOsnzVHkRtYvTIyu8yo0sAatkKT32wgY/miVhUHzdvG7KXDtUxHll9Nb ZFN7et0vwynujj3ou7Q+uTWYTWidmI5MMeO1wSjp/d0xjgFPmLXdMvkpi+wgOUuIt2kT y+u23kCzgOczHQiIhDAo7G7PRfkks7OWJuK25snVUEiprUMnGgMT/1LJ6QBp4W67vDN0 9KcQ== X-Gm-Message-State: AOAM532dpZ18SVhDkSmUJpwXVaGD03qZZULTQTKc+ukbQKhyd6PqBp5s Qw04hlJW88aNUrmKDGHsJCTu5M2fvVdfRg== X-Google-Smtp-Source: ABdhPJw4lfT0skGk65IwU4X1cD1ZqDIy2nVKz5R+ItYEQIJO4t5f2mMn2Wp/uJtrGXRlNBpiee01lw== X-Received: by 2002:a50:fc91:: with SMTP id f17mr25971641edq.201.1621874493701; Mon, 24 May 2021 09:41:33 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 02/28] configure: check for submodules if --with-git-submodules=ignore Date: Mon, 24 May 2021 18:41:05 +0200 Message-Id: <20210524164131.383778-3-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 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::530; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x530.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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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 808874cb31..f32c6f1a26 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 @@ -1591,6 +1573,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.31.1