From nobody Sat May 18 14:10:10 2024 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=1684486637; cv=none; d=zohomail.com; s=zohoarc; b=M1Eb+Y9si7P/R03r3c2eSfqG+aOnNo8ltXhf9l7buMT/cnQRgxdIYRfkOjGUDVoavkEAakia60xkTgI2wUlgphHYhx27zYaX9QCrr5CT5bR6ux8fnE1G6W11rwA029bDaJsAlgf0uqfv5SJ6uXCmgjACOYApvHdsJhHubrj2tlA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684486637; h=Content-Type:Content-Transfer-Encoding:Cc: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=mo+ztAyGGiOip3OHpCp1FYFteyCn3B9iHVCaLmu1ZYw=; b=fflDFuZJw43IvTV0qVcyRJqFRMvHkzipVYlQ/bIl+UoTpBMLv5AsbfdR37vwLtmWoClm2xsy3Vo63MfKSw6oti6u3784F4CkSs2BF6nIjoNCCOeT37KSswduE9VrRzTf/pvLGD/qty2pETAcRNDgfSpzQybBznJnHknjf5O7dM4= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1684486637354163.77123839878482; Fri, 19 May 2023 01:57:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzvuz-0002DG-1r; Fri, 19 May 2023 04:56:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzvuy-0002D7-04 for qemu-devel@nongnu.org; Fri, 19 May 2023 04:56:56 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzvuw-0000Ao-IK for qemu-devel@nongnu.org; Fri, 19 May 2023 04:56:55 -0400 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-249-eWQTwys1NROUbFDyAYipyA-1; Fri, 19 May 2023 04:56:52 -0400 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-969f12b2818so193371966b.1 for ; Fri, 19 May 2023 01:56:52 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id a9-20020a1709062b0900b00969dfd160aesm2012255ejg.109.2023.05.19.01.56.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 May 2023 01:56:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684486613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mo+ztAyGGiOip3OHpCp1FYFteyCn3B9iHVCaLmu1ZYw=; b=XaZ6QDKIQOPAnYGUBWW3IIm+ctD/y29OL3rpgDH/iiFkQk1Cf6ev5xKmMJPzJG3E187VPk L+FkkQo6WYqOPRc/o0XJ0Sq2xtijKkSfntwpBeoqn0EO2dxyJwhTKL8R4WOfSfsjDGaHFq XnVmwGiOXvc02ck+CB4gHQd3Rbba+ZQ= X-MC-Unique: eWQTwys1NROUbFDyAYipyA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684486611; x=1687078611; 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=mo+ztAyGGiOip3OHpCp1FYFteyCn3B9iHVCaLmu1ZYw=; b=OXPpmTJfbTFDWLSwRgYqOeJwMJ3iUHL6HqyJ9Dm9GQOTTsEI7XBF58CtnXOOn/YTMN 5wDPMHsp7X0HYsWsD0Z0qoEzuBgsmyTYrWtJa6Ak+QM1auqp8JkfDzY4H9YUT74pOcYA fOwpGH9gSnxvqscbRnQvNcTuY7moimGtBgrclTCUlq1E957U0vG0PbvfL016L8XOkmSc xoVaEwWRM97ywCdxzddclX5noHch1MANHv/HcDG1J9ZKci+ByleoAvfPg8tR/UE1gj6N U/oUoy4fC2TRyoOQwYBMvmXcSnHUnWlnEifXCtvj0ohKotTOCf87AATgQhEdB+YKjdFP hFBw== X-Gm-Message-State: AC+VfDwX5TAH7LYyMhSEotgdR0TvPJzgz5KIr9XDoe/RTOtxY+V9NZMN tmzDtVqImXhovm3VxI9La/NpARF+3eSzGUp1P/+g+RvcQ2ZUa+GgavIK08jIheZ9T7tTI0j8SOv uQIdOwCLbpXMCk/9iemXkzNFiGWGJe7WvCqpNBw0y66XT2hraAI7FJc9TQrUfLOaVvDbli+OEu1 Q= X-Received: by 2002:a17:907:930d:b0:96f:5cb3:df66 with SMTP id bu13-20020a170907930d00b0096f5cb3df66mr995438ejc.18.1684486610921; Fri, 19 May 2023 01:56:50 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7sym6X6etH/PVOk7cXj1AmnxRSgkpdSLIRT+ubjNvOWuowR6fW8SVLjmMEy43s3d48s3NBdg== X-Received: by 2002:a17:907:930d:b0:96f:5cb3:df66 with SMTP id bu13-20020a170907930d00b0096f5cb3df66mr995411ejc.18.1684486610489; Fri, 19 May 2023 01:56:50 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: marcandre.lureau@redhat.com, berrange@redhat.com, richard.henderson@linaro.org, peter.maydell@linaro.org Subject: [PATCH 1/6] remove remaining traces of meson submodule Date: Fri, 19 May 2023 10:56:41 +0200 Message-Id: <20230519085647.1104775-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230519085647.1104775-1-pbonzini@redhat.com> References: <20230519085647.1104775-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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1684486637729100002 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini Reviewed-by: Daniel P. Berrang=C3=A9 --- .gitlab-ci.d/buildtest-template.yml | 4 ---- scripts/archive-source.sh | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.gitlab-ci.d/buildtest-template.yml b/.gitlab-ci.d/buildtest-t= emplate.yml index 7edb50b76035..c9f2e737c09a 100644 --- a/.gitlab-ci.d/buildtest-template.yml +++ b/.gitlab-ci.d/buildtest-template.yml @@ -5,10 +5,6 @@ before_script: - JOBS=3D$(expr $(nproc) + 1) script: - - if test -n "$LD_JOBS"; - then - scripts/git-submodule.sh update meson ; - fi - mkdir build - cd build - ../configure --enable-werror --disable-docs --enable-fdt=3Dsystem diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh index 23e042dacdb3..c03532915471 100755 --- a/scripts/archive-source.sh +++ b/scripts/archive-source.sh @@ -26,7 +26,7 @@ sub_file=3D"${sub_tdir}/submodule.tar" # independent of what the developer currently has initialized # in their checkout, because the build environment is completely # different to the host OS. -submodules=3D"dtc meson ui/keycodemapdb" +submodules=3D"dtc ui/keycodemapdb" submodules=3D"$submodules tests/fp/berkeley-softfloat-3 tests/fp/berkeley-= testfloat-3" sub_deinit=3D"" =20 --=20 2.40.1 From nobody Sat May 18 14:10:10 2024 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=1684486657; cv=none; d=zohomail.com; s=zohoarc; b=DIFbfK6MluQElWKyGR3wAIw6TYefmHYHwvEbxQHJ8gSQKoCXplVHb4A6/5HYaNsMRpWmSq8d8cncuQprbDHJ2GcSuR7uwMbJtRmtBGTfRGLOF5TQWC/mAHVeG5+SjbpHFeBUrOqI1488siRdi7y55NI5acD77B+K0iaZST2iwd0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684486657; h=Content-Type:Content-Transfer-Encoding:Cc: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=uUtXAKQS8Ep2JwRv2ViPkG70CMSe3SeT6qXKklp0sBQ=; b=CnxBJkeyxzg1CxURqmCsQZznRZ9Xl2vjESwjvZFq2mdS8FkLm7Eoe4vszMJ/qyFG2y/8ZdYD5TtUnsVD/z64GjCwB1Sll1/mvWcpXso4u5dFfBYgh5X5UPYJwkx/yScZdmYnON3wAozCXWzK+6b/yk6zdz9hKt/eLdrsJVqpgXs= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1684486657560701.0590923701475; Fri, 19 May 2023 01:57:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzvv1-0002Dw-0M; Fri, 19 May 2023 04:56:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzvuz-0002Do-PY for qemu-devel@nongnu.org; Fri, 19 May 2023 04:56:57 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzvuy-0000B3-AF for qemu-devel@nongnu.org; Fri, 19 May 2023 04:56:57 -0400 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-619-c4Wu7e-4NC6J_YEn4w9Ztw-1; Fri, 19 May 2023 04:56:54 -0400 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-969ea6699fdso410816566b.3 for ; Fri, 19 May 2023 01:56:54 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id n11-20020a1709062bcb00b0096a91ab434fsm2016558ejg.40.2023.05.19.01.56.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 May 2023 01:56:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684486615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uUtXAKQS8Ep2JwRv2ViPkG70CMSe3SeT6qXKklp0sBQ=; b=CkEHzFtbGSEu0C3X0bGjnV2z5WFTgNehbOA9IM6jgR8KpkhKcTRxWAln80zdtFLA8olXDZ F9qQImxyNayyUEfTfZh6YNaMjK3/XHY9MeMTJQxwC5NsUR2bWWBJYgknD5M5z94eiXAae+ xkLXsTAWQre2wr5O3PEW9xXkYw7K2Qk= X-MC-Unique: c4Wu7e-4NC6J_YEn4w9Ztw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684486612; x=1687078612; 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=uUtXAKQS8Ep2JwRv2ViPkG70CMSe3SeT6qXKklp0sBQ=; b=UjLcjQt9uACLNX5BlHTJSdG/Mb3O0pO8pPbgylXfRtPMgAIq7EV+20Y6piIcx+6UIL m6wDD0ALA6YOrvWKZTr3Vr3Ix0F+RQa/UxfiqyAYHXkNW44JMCFntfcqba7N2zfqMhaf XG2pZG0YR9chZwd/xRUwfkCNJqQkGXPC2ndqiS697JKy1fyIC+x034RB91XqPq8XqGHz 3n8XZ1LlPzWTNa/CB82KkvuJ9m4rbZEp1V2t2tH0r4EeJr4fnyIWaqvkr9f0mXecjTSL 4KksVieJFpmmPV6X9pAFVZ6OVEKDtg/vz/9wcuqPWpZoEB/vZ0i/yANQRgDXB5V3ZB5f q00Q== X-Gm-Message-State: AC+VfDz+fAPeg54XdhIO1X1K+JkkcyDFAfJC5dAKcZ5qZhP6AiX0S9W1 2NymTwiiZ9GYdHkqLTU/GPmr2xatrxy3gJXMAqKHuQNnOb9f9C1MIkqJ3xFxUqtPQlyjtmXRTfW imFeQG6O34s4fs/USzdfJO4yv6NDwdCRioL2QgEBDM6+qMdu9wRFcH0nrSESUYXJiUksoqPZlKk 0= X-Received: by 2002:a17:907:8a10:b0:96a:d916:cb2f with SMTP id sc16-20020a1709078a1000b0096ad916cb2fmr1298312ejc.36.1684486612507; Fri, 19 May 2023 01:56:52 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4V1ztoV60ub/0cuDrcP/YyK88A7ykOSMEVp9psj7jNOBjwG3PRjCDy9sqborSAdY6nhOimIg== X-Received: by 2002:a17:907:8a10:b0:96a:d916:cb2f with SMTP id sc16-20020a1709078a1000b0096ad916cb2fmr1298290ejc.36.1684486612050; Fri, 19 May 2023 01:56:52 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: marcandre.lureau@redhat.com, berrange@redhat.com, richard.henderson@linaro.org, peter.maydell@linaro.org Subject: [PATCH 2/6] meson: simplify logic for -Dfdt Date: Fri, 19 May 2023 10:56:42 +0200 Message-Id: <20230519085647.1104775-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230519085647.1104775-1-pbonzini@redhat.com> References: <20230519085647.1104775-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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1684486658290100001 Content-Type: text/plain; charset="utf-8" fdt_opt =3D=3D 'disabled' is going to give an error if libfdt is required by any target, so catch that immediately. For fdt_opt =3D=3D 'enabled', instead, do not check immediately whether the internal libfdt is present. Instead do the check after ascertaining that libfdt is absent or too old. Signed-off-by: Paolo Bonzini Reviewed-by: Daniel P. Berrang=C3=A9 --- meson.build | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/meson.build b/meson.build index 41c87c441f8e..0de7a858bce1 100644 --- a/meson.build +++ b/meson.build @@ -3041,13 +3041,14 @@ if have_system and vfio_user_server_allowed endif =20 fdt =3D not_found -if have_system - fdt_opt =3D get_option('fdt') +fdt_opt =3D get_option('fdt') +if fdt_required.length() > 0 or fdt_opt =3D=3D 'enabled' + if fdt_opt =3D=3D 'disabled' + error('fdt disabled but required by targets ' + ', '.join(fdt_required= )) + endif + if fdt_opt in ['enabled', 'auto', 'system'] - have_internal =3D fs.exists(meson.current_source_dir() / 'dtc/libfdt/M= akefile.libfdt') - fdt =3D cc.find_library('fdt', - required: fdt_opt =3D=3D 'system' or - fdt_opt =3D=3D 'enabled' and not have_= internal) + fdt =3D cc.find_library('fdt', required: fdt_opt =3D=3D 'system') if fdt.found() and cc.links(''' #include #include @@ -3056,14 +3057,19 @@ if have_system fdt_opt =3D 'system' elif fdt_opt =3D=3D 'system' error('system libfdt requested, but it is too old (1.5.1 or newer r= equired)') - elif have_internal - fdt_opt =3D 'internal' else - fdt_opt =3D 'disabled' + fdt_opt =3D 'internal' fdt =3D not_found endif endif - if fdt_opt =3D=3D 'internal' + if not fdt.found() + assert(fdt_opt =3D=3D 'internal') + have_internal =3D fs.exists(meson.current_source_dir() / 'subprojects/= dtc/meson.build') + + if not have_internal + error('libfdt source not found - please pull git submodule') + endif + fdt_files =3D files( 'dtc/libfdt/fdt.c', 'dtc/libfdt/fdt_ro.c', @@ -3088,9 +3094,6 @@ if have_system else fdt_opt =3D 'disabled' endif -if not fdt.found() and fdt_required.length() > 0 - error('fdt not available but required by targets ' + ', '.join(fdt_requi= red)) -endif =20 config_host_data.set('CONFIG_CAPSTONE', capstone.found()) config_host_data.set('CONFIG_FDT', fdt.found()) --=20 2.40.1 From nobody Sat May 18 14:10:10 2024 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=1684486677; cv=none; d=zohomail.com; s=zohoarc; b=Y7d4PGNfeOK05pQMLj1uKvf3lwayJDBFef8tJLPWXw61/+v2dWO4X35M7FeEio35zlkohrs0HSAJFUwA2QVSZpk2NfoLaH/KcH4JfIMLUYtBBC8m2I1jWZ98PzdjX5erE8/dr5X3LThnKg+hl4NiRZxeD25YWPXYIfwyPJ523Co= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684486677; h=Content-Type:Content-Transfer-Encoding:Cc: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=Za4+aXmw/5iXJUQqKUjzp7XEhJVHVFmVvjnCtfJlXR0=; b=H1RSyfbpFN1RB+9de7QfxIDCUJ2v0MQG0ycVZ1BSxFHQrgK59aO8cgfspdG5RyB29j+SmB/rllQTa1kutD0FqrZLB2bi3yRp6q4O9c7ALGJevJkDzcdipfflg9/IP+cfMO78MkYpqlFXlO/8JN4Pd5VSQUioy0SoonMmb2sfxMQ= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1684486677938808.1343189716421; Fri, 19 May 2023 01:57:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzvvC-0002G1-Bk; Fri, 19 May 2023 04:57:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzvvA-0002Fe-Mq for qemu-devel@nongnu.org; Fri, 19 May 2023 04:57:08 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzvuz-0000BE-Bj for qemu-devel@nongnu.org; Fri, 19 May 2023 04:57:08 -0400 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-126-5CpBxshPPb6BJqPTWWDLug-1; Fri, 19 May 2023 04:56:55 -0400 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-96f4d917e06so86322966b.1 for ; Fri, 19 May 2023 01:56:55 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id y21-20020a1709060a9500b00965cd15c9bbsm2014531ejf.62.2023.05.19.01.56.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 May 2023 01:56:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684486616; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Za4+aXmw/5iXJUQqKUjzp7XEhJVHVFmVvjnCtfJlXR0=; b=Mn+eRYz5DVg+tOSRycgCkgfLRrNBQUQCnW8S0iI+giPxmIycib1A3NPC9Xw0mH5YDjEBwu Vzj36UyFDTErHYGgtNg/E4fqeUPYtstrIi3+gq83b+Fnm6JQucrrB8opsSUr2s6starvfg Gs6NpMRaWlKumts218esy9I5RgzoDxs= X-MC-Unique: 5CpBxshPPb6BJqPTWWDLug-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684486614; x=1687078614; 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=Za4+aXmw/5iXJUQqKUjzp7XEhJVHVFmVvjnCtfJlXR0=; b=Ip/0A9hJA6jMXiuYrQaqRNnXxRSyT3i25TUPg6cl/bbHL/qyPfMieT88L3Nu+DeFrO lb24VKfv3WO3lP4IgNAu3doMgxVjOKMOky2eWQkXycubncCOBr3oD48KAH5a1gD6cK8D 8zqXSrN39eAGXUOxGDfVJVuCCOmynNAlHzl5wwU+2gOfH44Hk+BK4ghUz3t69e65NbkQ 3MmqrFH1sNYjkiLRsdLcm0oyjD+FuGL3nV/8e6wtU8we2tyffG2hBu18HhTm3gWBTXkx sZvChgwnEbuSDx3gZjAcilAs34CTujATx/1E//PrP6nTIyrY4phF7m1PnNeA4DKl+KfN 8R4w== X-Gm-Message-State: AC+VfDxpzIIn2nMp8xusb+gNuqURuZ9Pp3w89kaOmFHaF6ue6CGWr0Zk Ytx/Hp1yl64XW1gNZPhAFrWZeTA/w+OO5k+N87pWdaELrkwrE4+L/zX2HsDhDjGdP8DMZLn4OvB zsPpEof1BQJL4W7+rsTXw3NImdY3xMBYYO/ajNbHlF/UY9S+0PH9KHZbUBpfiEhZhxExuED2fDi c= X-Received: by 2002:a17:907:7251:b0:96f:7060:9654 with SMTP id ds17-20020a170907725100b0096f70609654mr680909ejc.18.1684486613845; Fri, 19 May 2023 01:56:53 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7Swx1BPbEp2/9caxns63aMOUlLEqpxscvj+feHTGir1eD7ZTYyGLik67Sw9MCiGlYTFEnFrA== X-Received: by 2002:a17:907:7251:b0:96f:7060:9654 with SMTP id ds17-20020a170907725100b0096f70609654mr680894ejc.18.1684486613640; Fri, 19 May 2023 01:56:53 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: marcandre.lureau@redhat.com, berrange@redhat.com, richard.henderson@linaro.org, peter.maydell@linaro.org Subject: [PATCH 3/6] meson: use subproject for internal libfdt Date: Fri, 19 May 2023 10:56:43 +0200 Message-Id: <20230519085647.1104775-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230519085647.1104775-1-pbonzini@redhat.com> References: <20230519085647.1104775-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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1684486678408100017 Content-Type: text/plain; charset="utf-8" Recent dtc/libfdt can use either Make or meson as the build system. By using a subproject, our own meson.build can remove the hard coded list of source files. This is also the first step towards managing downloads with .wrap files instead of submodule. Signed-off-by: Paolo Bonzini Reviewed-by: Daniel P. Berrang=C3=A9 --- .gitmodules | 4 ++-- configure | 2 +- meson.build | 24 ++++-------------------- scripts/archive-source.sh | 2 +- dtc =3D> subprojects/dtc | 0 5 files changed, 8 insertions(+), 24 deletions(-) rename dtc =3D> subprojects/dtc (100%) diff --git a/.gitmodules b/.gitmodules index 2a3a12033c4b..3ed5d073d630 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,8 +13,8 @@ [submodule "roms/qemu-palcode"] path =3D roms/qemu-palcode url =3D https://gitlab.com/qemu-project/qemu-palcode.git -[submodule "dtc"] - path =3D dtc +[submodule "subprojects/dtc"] + path =3D subprojects/dtc url =3D https://gitlab.com/qemu-project/dtc.git [submodule "roms/u-boot"] path =3D roms/u-boot diff --git a/configure b/configure index 31a787153e38..5bbca83d9a31 100755 --- a/configure +++ b/configure @@ -1188,7 +1188,7 @@ fi case "$fdt" in auto | enabled | internal) # Simpler to always update submodule, even if not needed. - git_submodules=3D"${git_submodules} dtc" + git_submodules=3D"${git_submodules} subprojects/dtc" ;; esac =20 diff --git a/meson.build b/meson.build index 0de7a858bce1..1a55039ff7c3 100644 --- a/meson.build +++ b/meson.build @@ -3070,26 +3070,10 @@ if fdt_required.length() > 0 or fdt_opt =3D=3D 'ena= bled' error('libfdt source not found - please pull git submodule') endif =20 - fdt_files =3D files( - 'dtc/libfdt/fdt.c', - 'dtc/libfdt/fdt_ro.c', - 'dtc/libfdt/fdt_wip.c', - 'dtc/libfdt/fdt_sw.c', - 'dtc/libfdt/fdt_rw.c', - 'dtc/libfdt/fdt_strerror.c', - 'dtc/libfdt/fdt_empty_tree.c', - 'dtc/libfdt/fdt_addresses.c', - 'dtc/libfdt/fdt_overlay.c', - 'dtc/libfdt/fdt_check.c', - ) - - fdt_inc =3D include_directories('dtc/libfdt') - libfdt =3D static_library('fdt', - build_by_default: false, - sources: fdt_files, - include_directories: fdt_inc) - fdt =3D declare_dependency(link_with: libfdt, - include_directories: fdt_inc) + libfdt_proj =3D subproject('dtc', + default_options: ['tools=3Dfalse', 'yaml=3Dd= isabled', + 'python=3Ddisabled', 'defau= lt_library=3Dstatic']) + fdt =3D libfdt_proj.get_variable('libfdt_dep') endif else fdt_opt =3D 'disabled' diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh index c03532915471..a7c2886334f0 100755 --- a/scripts/archive-source.sh +++ b/scripts/archive-source.sh @@ -26,7 +26,7 @@ sub_file=3D"${sub_tdir}/submodule.tar" # independent of what the developer currently has initialized # in their checkout, because the build environment is completely # different to the host OS. -submodules=3D"dtc ui/keycodemapdb" +submodules=3D"subprojects/dtc ui/keycodemapdb" submodules=3D"$submodules tests/fp/berkeley-softfloat-3 tests/fp/berkeley-= testfloat-3" sub_deinit=3D"" =20 diff --git a/dtc b/subprojects/dtc similarity index 100% rename from dtc rename to subprojects/dtc --=20 2.40.1 From nobody Sat May 18 14:10:10 2024 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=1684486676; cv=none; d=zohomail.com; s=zohoarc; b=Eu/a7qQnZgO7NFLvol6Kfyg9joFrNbYtQISMl+9L2rvIf63NFNYPLXSCHvx4IrbCoBvdgMy/UwqmmQFeq/gOoiZlxq0bR1T8ffrmQU2NShozxNQ1FcYqBgA34ldzDj4VwnkE22Y+cE/EhANDMT7C+qga1KWJSlqsv6A4GKG/C24= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684486676; h=Content-Type:Content-Transfer-Encoding:Cc: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=q7hu8guGS9407jlL+W5FPEBijG3LDRFTX9tNbWaP30M=; b=lWkFXXfxKCuYziGAjIZLZKg7Vl9/qrVTlHjgmRKDkPVxIfBXu7lvZxZ0dtHIbjhyQMxqXtq4dEK6+GDo6ZKbZjYmNBma13V0qcs7hm71wh2sIvm/O9dpoMY4Fs6M1+5I90Ok1vTZm9k+P3aFh/Cr8oDgwtrYB1phe8V9cJ0UqCQ= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1684486676452820.1479087288525; Fri, 19 May 2023 01:57:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzvv4-0002EX-Lb; Fri, 19 May 2023 04:57:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzvv2-0002EH-SU for qemu-devel@nongnu.org; Fri, 19 May 2023 04:57:00 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzvv1-0000Bc-88 for qemu-devel@nongnu.org; Fri, 19 May 2023 04:57:00 -0400 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-164-abV50k2VO1Su5Z0FdA7wNg-1; Fri, 19 May 2023 04:56:57 -0400 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-96f6e83685eso38534066b.1 for ; Fri, 19 May 2023 01:56:57 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id a21-20020a1709063e9500b009655eb8be26sm2016200ejj.73.2023.05.19.01.56.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 May 2023 01:56:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684486618; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=q7hu8guGS9407jlL+W5FPEBijG3LDRFTX9tNbWaP30M=; b=ZDJwar9w+/Irpv2Yr0Ve4ifckTv1jgeUBFrJ2ZLNIhxWAj7XoofS/qy9NW1/XaGvqnAGym +XOb+Ps0hulE0pHwK/2a584Gz+wHEJwiUOI9v4fl0cl5zDpeRBNFnctdTEmD6y2iOplD9C oSafIX5VdGYDFTIC/KuzK/2HKvJ6riI= X-MC-Unique: abV50k2VO1Su5Z0FdA7wNg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684486615; x=1687078615; 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=q7hu8guGS9407jlL+W5FPEBijG3LDRFTX9tNbWaP30M=; b=VCL069G7sps2KyzRNRaKr8SaBwVgfAjTpvHIxS4xRTP3SR1mb5uT0xobzqG1zeoZES FySsTwARYUV7vsnrtDpTiR4RWBG5wtnaj/e5xIduMDsBeADw1zggV2EKPH9OeEksQrzV wt1+1Kb4IToCVmwjAF/FA7Q2C5lLILDey0aAr42g0dsBJ/9yAjH6QWGq+MtvHTg/Lfpb T0nGtZc/Yjeem3GSmKvXrY0nzM9QsjDwyvT4c3tA+Sk9pby3UFkfyJZ9xuZQHKWzh3Rs Rt/snDHinleNTuR29pYlmNBP1/+1nukt/4Ep5BNskTW5yABRuyRr7AexQfqWaJ2a4YTS kCaA== X-Gm-Message-State: AC+VfDwPJzvg6X3BtWu7okQp9Zy8ATwGolPiWqUXSqxYaVp+Y9AWD1/r vxnOHzhTvN5UpkJAVoWsolO4DpFfmwoJZo1hcpt9obPURthqVRbeKPxqaFll7AY7kZQcOAoTkPQ SJPZGRxbTMXUJDm80XDvX1H8PRWoJBke4RSz3972K15XVmXpljkWoZ+MREjGA+a/O1tiDJm3noq 8= X-Received: by 2002:a17:907:86aa:b0:966:5c04:2c5a with SMTP id qa42-20020a17090786aa00b009665c042c5amr958718ejc.69.1684486615587; Fri, 19 May 2023 01:56:55 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7YYCVuSavaJKHFM08y4m1+JKo/f4GSTLgQK+yFuu924ABZxlyPgcBgyVNFjCXaeoRzWKofSg== X-Received: by 2002:a17:907:86aa:b0:966:5c04:2c5a with SMTP id qa42-20020a17090786aa00b009665c042c5amr958697ejc.69.1684486615158; Fri, 19 May 2023 01:56:55 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: marcandre.lureau@redhat.com, berrange@redhat.com, richard.henderson@linaro.org, peter.maydell@linaro.org Subject: [PATCH 4/6] meson: use subproject for keycodemapdb Date: Fri, 19 May 2023 10:56:44 +0200 Message-Id: <20230519085647.1104775-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230519085647.1104775-1-pbonzini@redhat.com> References: <20230519085647.1104775-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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1684486677874100011 Content-Type: text/plain; charset="utf-8" By using a subproject, our own meson.build can use variables from the subproject instead of hard-coded paths. This is also the first step towards managing downloads with .wrap files instead of submodule. Signed-off-by: Paolo Bonzini Reviewed-by: Daniel P. Berrang=C3=A9 --- .gitmodules | 4 ++-- configure | 4 ++-- scripts/archive-source.sh | 2 +- {ui =3D> subprojects}/keycodemapdb | 0 ui/meson.build | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-) rename {ui =3D> subprojects}/keycodemapdb (100%) diff --git a/.gitmodules b/.gitmodules index 3ed5d073d630..f8b2ddf3877c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -25,8 +25,8 @@ [submodule "roms/QemuMacDrivers"] path =3D roms/QemuMacDrivers url =3D https://gitlab.com/qemu-project/QemuMacDrivers.git -[submodule "ui/keycodemapdb"] - path =3D ui/keycodemapdb +[submodule "subprojects/keycodemapdb"] + path =3D subprojects/keycodemapdb url =3D https://gitlab.com/qemu-project/keycodemapdb.git [submodule "roms/seabios-hppa"] path =3D roms/seabios-hppa diff --git a/configure b/configure index 5bbca83d9a31..2b6995e16756 100755 --- a/configure +++ b/configure @@ -254,7 +254,7 @@ else git_submodules_action=3D"ignore" fi =20 -git_submodules=3D"ui/keycodemapdb" +git_submodules=3D"subprojects/keycodemapdb" git=3D"git" debug_tcg=3D"no" docs=3D"auto" @@ -806,7 +806,7 @@ case $git_submodules_action in fi ;; ignore) - if ! test -f "$source_path/ui/keycodemapdb/README" + if ! test -f "$source_path/subprojects/keycodemapdb/README" then echo echo "ERROR: missing GIT submodules" diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh index a7c2886334f0..dba5ae05b67e 100755 --- a/scripts/archive-source.sh +++ b/scripts/archive-source.sh @@ -26,7 +26,7 @@ sub_file=3D"${sub_tdir}/submodule.tar" # independent of what the developer currently has initialized # in their checkout, because the build environment is completely # different to the host OS. -submodules=3D"subprojects/dtc ui/keycodemapdb" +submodules=3D"subprojects/dtc subprojects/keycodemapdb" submodules=3D"$submodules tests/fp/berkeley-softfloat-3 tests/fp/berkeley-= testfloat-3" sub_deinit=3D"" =20 diff --git a/ui/keycodemapdb b/subprojects/keycodemapdb similarity index 100% rename from ui/keycodemapdb rename to subprojects/keycodemapdb diff --git a/ui/meson.build b/ui/meson.build index 330369707dd7..e09b616a66bc 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -162,15 +162,15 @@ keymaps =3D [ ] =20 if have_system or xkbcommon.found() + keycodemapdb_proj =3D subproject('keycodemapdb', required: true) foreach e : keymaps output =3D 'input-keymap-@0@-to-@1@.c.inc'.format(e[0], e[1]) genh +=3D custom_target(output, output: output, capture: true, - input: files('keycodemapdb/data/keymaps.csv'), - command: [python, files('keycodemapdb/tools/keymap-gen'), - 'code-map', - '--lang', 'glib2', + input: keycodemapdb_proj.get_variable('keymaps_csv'), + command: [python, keycodemapdb_proj.get_variable('keymap= _gen').full_path(), + 'code-map', '--lang', 'glib2', '--varname', 'qemu_input_map_@0@_to_@1@'.forma= t(e[0], e[1]), '@INPUT0@', e[0], e[1]]) endforeach --=20 2.40.1 From nobody Sat May 18 14:10:10 2024 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=1684486676; cv=none; d=zohomail.com; s=zohoarc; b=C9jFnTqRr7tZ+AF+1aHsHO/C52pvrXdCn538B81vzp6t8Ctes5y5I8xTNMSMVrWVJGOdR0u0v7P965K+UOE4BOLf9+1NHDLgofr5IRc7X/8munmjcRfdHV4XwFTaFXkIshuIE47VSj7hyryny/Jen6dJ6YOqeAnEMLoGJzKKuc0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684486676; h=Content-Type:Content-Transfer-Encoding:Cc: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=EWnHqrDaDrc0Yt2ijn7nY1ZzzrQQlpfEkdayY9n7Fm8=; b=k/34mEntMwfZ1M5RdnBJ2fbxuRf7xALhGLieufRE3WSjXgTsCCsAi3gkl36gTlSwrRB+lCdwsOeUIQE0Bmg//LObFWLacKP8O/OqXgdFEIAMd2lYfAGMVLDPugmDo67fN5J5fn3DtzOOEFORV41g3Vu7UG6Ch+n8kdpUr4m2liU= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1684486676592262.8640632916587; Fri, 19 May 2023 01:57:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzvv6-0002F3-IA; Fri, 19 May 2023 04:57:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzvv4-0002EQ-AI for qemu-devel@nongnu.org; Fri, 19 May 2023 04:57:02 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzvv2-0000Bl-Pe for qemu-devel@nongnu.org; Fri, 19 May 2023 04:57:02 -0400 Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-625-1yb-BZGMOnSAbze_Ww_alg-1; Fri, 19 May 2023 04:56:59 -0400 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-969f24626fbso88304666b.0 for ; Fri, 19 May 2023 01:56:58 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id j25-20020a170906095900b009584c5bcbc7sm1997474ejd.49.2023.05.19.01.56.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 May 2023 01:56:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684486620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EWnHqrDaDrc0Yt2ijn7nY1ZzzrQQlpfEkdayY9n7Fm8=; b=Z8thayzFELvO8l6Z11tkXuyyeEkG99ec6nJv+EY29aJE/YzhTHmMDKz1AgQ3y0Du8tmW+Y FtkvXtXYtQutKKDCBtd4J/TNNONuzQzFBAeJJ8tVG6Kz28C8nb7ti2Y64cSkj7PS3JofT9 uRwiYMNLfmSeukfLyxVu+LvyXbIuWnw= X-MC-Unique: 1yb-BZGMOnSAbze_Ww_alg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684486617; x=1687078617; 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=EWnHqrDaDrc0Yt2ijn7nY1ZzzrQQlpfEkdayY9n7Fm8=; b=g2n/hMu2YEOH6vfxZs5lxiTUBDu2RTEKSYNsZEJ/K2BembG5zaDFfss5IX1F7c3aBP yAKx7iIMKy+svBpLEMNblEiesiaEJxm1Ctkyvj3joTVtdWWqsy0Yne/MHl1gZHXMytuz 3j6H7CL9yz9fGRkVYinmVY8N5bxk/CebSftI+sDTPdOBDiB291GnOw9YWpO2wRoxXrIp UYqBVuOvkTdJNksCW5dvtbWxN6dQ2M60Fxcy3mGyDbaEAG5hKA47yDXvp4C6SQDJs93C NO3I24MKerC3UQ5iYNp0TcBb7iKWDGMVKTLxdvrItLtkG3JHcRrUtsgh4Xb3ADBLdGMa NWVA== X-Gm-Message-State: AC+VfDzE0Gtd9XlMF2hcBcLdlZA66LSgtk9jnpw1jt4QVTU9ogcxPAwd mL8+aiuVa/IPh4j3jz41i3s0BBtdKLj5MlUMNJ2MfgKY788QIrnlWaKyRcx0PEwdtq8n3piu4om VWffMyxiinOIn8BU3nly8nFNggQBBpo7GysNe6wo4gOEdGyBB0OW27W1K7baSTf/+0ssOYaE6RJ A= X-Received: by 2002:a17:907:7ea3:b0:966:399e:a5a5 with SMTP id qb35-20020a1709077ea300b00966399ea5a5mr1113946ejc.35.1684486617350; Fri, 19 May 2023 01:56:57 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ60IeLdyeZY3Q82G3GIe82pbRrtYEceMpGEAip2XIHVvNUPfAv81t59HzLsShhwTminXf5Qfw== X-Received: by 2002:a17:907:7ea3:b0:966:399e:a5a5 with SMTP id qb35-20020a1709077ea300b00966399ea5a5mr1113926ejc.35.1684486616982; Fri, 19 May 2023 01:56:56 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: marcandre.lureau@redhat.com, berrange@redhat.com, richard.henderson@linaro.org, peter.maydell@linaro.org Subject: [PATCH 5/6] configure: rename --enable-pypi to --enable-download, control subprojects too Date: Fri, 19 May 2023 10:56:45 +0200 Message-Id: <20230519085647.1104775-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230519085647.1104775-1-pbonzini@redhat.com> References: <20230519085647.1104775-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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1684486677879100012 Content-Type: text/plain; charset="utf-8" The behavior of --{enable,disable}-pypi is similar to that of -Dwrapmode=3D{default,nodownload} respectively. In particular, in both cases a feature needs to be explicitly enabled for the dependency to be downloaded. So, use a single option to control both cases. Now, --enable-slirp will trigger cloning and building of libslirp if the .pc file is not found on the machine. Signed-off-by: Paolo Bonzini Reviewed-by: Daniel P. Berrang=C3=A9 --- .gitignore | 2 -- configure | 17 +++++++---------- subprojects/.gitignore | 3 +++ 3 files changed, 10 insertions(+), 12 deletions(-) create mode 100644 subprojects/.gitignore diff --git a/.gitignore b/.gitignore index 1ea59f481921..61fa39967b54 100644 --- a/.gitignore +++ b/.gitignore @@ -20,5 +20,3 @@ GTAGS *.swp *.patch *.gcov - -/subprojects/slirp diff --git a/configure b/configure index 2b6995e16756..43620b80c8df 100755 --- a/configure +++ b/configure @@ -267,7 +267,7 @@ bsd_user=3D"" plugins=3D"$default_feature" ninja=3D"" python=3D -pypi=3D"enabled" +download=3D"enabled" bindir=3D"bin" skip_meson=3Dno vfio_user_server=3D"disabled" @@ -765,9 +765,9 @@ for opt do --with-git-submodules=3D*) git_submodules_action=3D"$optarg" ;; - --disable-pypi) pypi=3D"disabled" + --disable-download) download=3D"disabled" ;; - --enable-pypi) pypi=3D"enabled" + --enable-download) download=3D"enabled" ;; --enable-plugins) if test "$mingw32" =3D "yes"; then error_exit "TCG plugins not currently supported on= Windows platforms" @@ -978,7 +978,7 @@ python=3D"$(command -v "$python")" # - venv is allowed to use system packages; # - all setup can be performed offline; # - missing packages may be fetched from PyPI, -# unless --disable-pypi is passed. +# unless --disable-download is passed. # - pip is not installed into the venv when possible, # but ensurepip is called as a fallback when necessary. =20 @@ -995,7 +995,7 @@ python=3D"$python -B" mkvenv=3D"$python ${source_path}/python/scripts/mkvenv.py" =20 mkvenv_flags=3D"" -if test "$pypi" =3D "enabled" ; then +if test "$download" =3D "enabled" ; then mkvenv_flags=3D"--online" fi =20 @@ -1018,7 +1018,7 @@ meson=3D"$(cd pyvenv/bin; pwd)/meson" # Conditionally ensure Sphinx is installed. =20 mkvenv_flags=3D"" -if test "$pypi" =3D "enabled" -a "$docs" =3D "enabled" ; then +if test "$download" =3D "enabled" -a "$docs" =3D "enabled" ; then mkvenv_flags=3D"--online" fi =20 @@ -1960,11 +1960,8 @@ if test "$skip_meson" =3D no; then =20 rm -rf meson-private meson-info meson-logs =20 - # Prevent meson from automatically downloading wrapped subprojects when = missing. - # You can use 'meson subprojects download' before running configure. - meson_option_add "--wrap-mode=3Dnodownload" - # Built-in options + test "$download" =3D "disabled" && meson_option_add "--wrap-mode=3Dnodow= nload" test "$bindir" !=3D "bin" && meson_option_add "-Dbindir=3D$bindir" test "$default_feature" =3D no && meson_option_add -Dauto_features=3Ddis= abled test "$static" =3D yes && meson_option_add -Dprefer_static=3Dtrue diff --git a/subprojects/.gitignore b/subprojects/.gitignore new file mode 100644 index 000000000000..7560ebb0b1a0 --- /dev/null +++ b/subprojects/.gitignore @@ -0,0 +1,3 @@ +/packagecache + +/slirp --=20 2.40.1 From nobody Sat May 18 14:10:10 2024 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=1684486676; cv=none; d=zohomail.com; s=zohoarc; b=ivkwGP/7C6T+Q1iHm8iujxjyRy6WybukDZ8HrfbuaGyy7KPDHTSTaPsZc3RXBftN43G0Dz8WZnbDUPWNNfw6pn4r0QkpFkpy950jccWKxcjA1c5kS8mx6MpertGcMZklw1xvFf+dHHbHh9i8YvOBWQhSguS00ew6S50lJbxxskc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684486676; h=Content-Type:Content-Transfer-Encoding:Cc: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=H4SOv4uBSicwV7gPOyY1JVtt4S6zbYQ/+kUgyvA2jac=; b=M19NQaT6BPRVMEqvW0ZXzvb+DLD2zta48nVn/qiaLVnvbzGOhLpzbWPBgPrFGitI/HZh5rvDlZracQk5nukksjqJgCkVQvh+8yReekGprrDVqs/uczSNmAw25Wfd7V6T2/Zi+Lvy5+GSS9x/dnh+lzYupn1PY9NwvhCdk2UtVGo= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1684486676400439.3962789864313; Fri, 19 May 2023 01:57:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzvv8-0002Fb-NQ; Fri, 19 May 2023 04:57:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzvv6-0002F7-TW for qemu-devel@nongnu.org; Fri, 19 May 2023 04:57:04 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzvv4-0000C6-Po for qemu-devel@nongnu.org; Fri, 19 May 2023 04:57:04 -0400 Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-284-LsW8T3plNUu44OXpkfXHMg-1; Fri, 19 May 2023 04:57:01 -0400 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-965b73d8b7eso331633066b.2 for ; Fri, 19 May 2023 01:57:00 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id dx26-20020a170906a85a00b0096a1ba4e0d1sm2023301ejb.32.2023.05.19.01.56.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 May 2023 01:56:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684486622; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=H4SOv4uBSicwV7gPOyY1JVtt4S6zbYQ/+kUgyvA2jac=; b=fGovx35e8pikGKe5c70lIazJ7eX/DaqEANcMWH0Jl5iGK64Pr7DTKV2KnbmHssNoXXakgI qOFWdn8sq3ugHe3Z5s/kn7Zsf100CO3gnWz+EyOu8ErlppklVzNdaI/NprqDwuz8vKVy5v u4lJGFuDmPYedqMJTv4nCTL0rHouXdA= X-MC-Unique: LsW8T3plNUu44OXpkfXHMg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684486619; x=1687078619; 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=H4SOv4uBSicwV7gPOyY1JVtt4S6zbYQ/+kUgyvA2jac=; b=Bjif656YNLqORbf0aswMCA2wtrRdS7rPx0/94DLHImwLzoIhB1XfozeprtL4mWjlVR oHCY4HVdvhN5wWTINnDiW2CXLGLAdy4exZEYqflnEQFy27xF6NeA2+4XNiw3bDEp6MdW 340oYAI+hlIU08qULII5gdiRPgWiIsJrTs8ucX9x/LwfzndR8ZXQHO5uX7Z0CCiXAs+6 ktk+jv8tcQxNYniyKJfQ4RSPEG1nvkQCREHod1k3uXYhccpQORgx5WlmLmXHYTBgwcf+ hTUEbDSLH4ciUDapbl75qWN0fVRD/tsTHwuMuaKl8G+3G44kfJOrsgq9D5OS2coxX8tt 0+iw== X-Gm-Message-State: AC+VfDxRQaMbQuiQhAsiwObVLMz4FHcIReyiZZPeii+Ef7RYIo1katDd I5xQ0jZjOP4kRt6cbugV+K81G1pheGll1b60NaP0P61kfaNbsZTg/4a9IJ8mPilcFPLwM0lgDub KB31S42KpYkRKbS79V1x3Xd5kRr+HDz9J6bY6ZpKjjkjEr8/vagJN4VVcn7C+TR+3oSCjgO7arj 0= X-Received: by 2002:a17:907:7e8b:b0:960:d9d:ffb5 with SMTP id qb11-20020a1709077e8b00b009600d9dffb5mr934087ejc.41.1684486619393; Fri, 19 May 2023 01:56:59 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7tWSvUKaCuHb1lGr3Bz35UPfPkzZJRbaC3c5BnrOLr1UcbXc98/HsFVJ3TMjBghiZ+NJd5hg== X-Received: by 2002:a17:907:7e8b:b0:960:d9d:ffb5 with SMTP id qb11-20020a1709077e8b00b009600d9dffb5mr934066ejc.41.1684486619003; Fri, 19 May 2023 01:56:59 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: marcandre.lureau@redhat.com, berrange@redhat.com, richard.henderson@linaro.org, peter.maydell@linaro.org Subject: [PATCH 6/6] meson: subprojects: replace submodules with wrap files Date: Fri, 19 May 2023 10:56:46 +0200 Message-Id: <20230519085647.1104775-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230519085647.1104775-1-pbonzini@redhat.com> References: <20230519085647.1104775-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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1684486678435100018 Content-Type: text/plain; charset="utf-8" Compared to submodules, .wrap files have several advantages: * option parsing and downloading is delegated to meson * the commit is stored in a text file instead of a magic entry in the git tree object * we could stop shipping external dependencies that are only used as a fallback, but not break compilation on platforms that lack them. For example it may make sense to download dtc at build time, controlled by --enable-download, even when building from a tarball. This is _not_ done in this patch. dependency() can fall back to a wrap automatically. However, this is only possible for libraries that come with a .pc file, and this is not very common for libfdt even though the upstream project in principle provides it; it also removes the control that we provide with --enable-fdt=3D{system,internal}. Therefore, the logic to pick system vs. internal libfdt is left untouched. It is possible to use subprojects also for berkeley-softfloat-3 and berkeley-testfloat-3, but this is left for later. Signed-off-by: Paolo Bonzini --- .gitlab-ci.d/buildtest-template.yml | 1 + .gitmodules | 9 ----- configure | 54 +++++------------------------ meson.build | 17 ++------- meson_options.txt | 1 + scripts/archive-source.sh | 11 ++++-- scripts/make-release | 5 +++ subprojects/.gitignore | 3 ++ subprojects/dtc | 1 - subprojects/dtc.wrap | 4 +++ subprojects/keycodemapdb | 1 - subprojects/keycodemapdb.wrap | 4 +++ subprojects/libvfio-user | 1 - subprojects/libvfio-user.wrap | 4 +++ 14 files changed, 41 insertions(+), 75 deletions(-) delete mode 160000 subprojects/dtc create mode 100644 subprojects/dtc.wrap delete mode 160000 subprojects/keycodemapdb create mode 100644 subprojects/keycodemapdb.wrap delete mode 160000 subprojects/libvfio-user create mode 100644 subprojects/libvfio-user.wrap diff --git a/.gitlab-ci.d/buildtest-template.yml b/.gitlab-ci.d/buildtest-t= emplate.yml index c9f2e737c09a..3c997d7265b2 100644 --- a/.gitlab-ci.d/buildtest-template.yml +++ b/.gitlab-ci.d/buildtest-template.yml @@ -44,6 +44,7 @@ script: - scripts/git-submodule.sh update $(sed -n '/GIT_SUBMODULES=3D/ s/.*=3D// p' build/config-host.mak) + - meson subprojects download $(cd build/subprojects && echo *) - cd build - find . -type f -exec touch {} + # Avoid recompiling by hiding ninja with NINJA=3D":" diff --git a/.gitmodules b/.gitmodules index f8b2ddf3877c..a934c85e4e40 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,9 +13,6 @@ [submodule "roms/qemu-palcode"] path =3D roms/qemu-palcode url =3D https://gitlab.com/qemu-project/qemu-palcode.git -[submodule "subprojects/dtc"] - path =3D subprojects/dtc - url =3D https://gitlab.com/qemu-project/dtc.git [submodule "roms/u-boot"] path =3D roms/u-boot url =3D https://gitlab.com/qemu-project/u-boot.git @@ -25,9 +22,6 @@ [submodule "roms/QemuMacDrivers"] path =3D roms/QemuMacDrivers url =3D https://gitlab.com/qemu-project/QemuMacDrivers.git -[submodule "subprojects/keycodemapdb"] - path =3D subprojects/keycodemapdb - url =3D https://gitlab.com/qemu-project/keycodemapdb.git [submodule "roms/seabios-hppa"] path =3D roms/seabios-hppa url =3D https://gitlab.com/qemu-project/seabios-hppa.git @@ -55,6 +49,3 @@ [submodule "tests/lcitool/libvirt-ci"] path =3D tests/lcitool/libvirt-ci url =3D https://gitlab.com/libvirt/libvirt-ci.git -[submodule "subprojects/libvfio-user"] - path =3D subprojects/libvfio-user - url =3D https://gitlab.com/qemu-project/libvfio-user.git diff --git a/configure b/configure index 43620b80c8df..1e737f322360 100755 --- a/configure +++ b/configure @@ -254,7 +254,7 @@ else git_submodules_action=3D"ignore" fi =20 -git_submodules=3D"subprojects/keycodemapdb" +git_submodules=3D"" git=3D"git" debug_tcg=3D"no" docs=3D"auto" @@ -270,7 +270,6 @@ python=3D download=3D"enabled" bindir=3D"bin" skip_meson=3Dno -vfio_user_server=3D"disabled" use_containers=3D"yes" gdb_bin=3D$(command -v "gdb-multiarch" || command -v "gdb") gdb_arches=3D"" @@ -282,16 +281,13 @@ unset target_list_exclude =20 # The following Meson options are handled manually (still they # are included in the automatically generated help message) - -# 1. Track which submodules are needed -fdt=3D"auto" - -# 2. Automatically enable/disable other options +# because they automatically enable/disable other options tcg=3D"auto" cfi=3D"false" =20 -# 3. Need to check for -static-pie before Meson runs. Also, -# Meson has PIE as a boolean rather than enabled/disabled/auto. +# Meson has PIE as a boolean rather than enabled/disabled/auto, +# and we also need to check for -static-pie before Meson runs +# which requires knowing whether --static is enabled. pie=3D"" static=3D"no" =20 @@ -752,14 +748,6 @@ for opt do ;; --disable-cfi) cfi=3D"false" ;; - --disable-fdt) fdt=3D"disabled" - ;; - --enable-fdt) fdt=3D"enabled" - ;; - --enable-fdt=3Dgit) fdt=3D"internal" - ;; - --enable-fdt=3D*) fdt=3D"$optarg" - ;; --with-git=3D*) git=3D"$optarg" ;; --with-git-submodules=3D*) @@ -783,10 +771,6 @@ for opt do ;; --gdb=3D*) gdb_bin=3D"$optarg" ;; - --enable-vfio-user-server) vfio_user_server=3D"enabled" - ;; - --disable-vfio-user-server) vfio_user_server=3D"disabled" - ;; # everything else has the same name in configure and meson --*) meson_option_parse "$opt" "$optarg" ;; @@ -806,10 +790,11 @@ case $git_submodules_action in fi ;; ignore) - if ! test -f "$source_path/subprojects/keycodemapdb/README" + if ! test -f "$source_path/subprojects/keycodemapdb/README" \ + || ! test -f "$source_path/tests/fp/berkeley-testfloat-3/READM= E.md" then echo - echo "ERROR: missing GIT submodules" + echo "ERROR: missing GIT submodules or subprojects" echo if test -e "$source_path/.git"; then echo "--with-git-submodules=3Dignore specified but submodu= les were not" @@ -1182,16 +1167,6 @@ EOF fi fi =20 -########################################## -# fdt probe - -case "$fdt" in - auto | enabled | internal) - # Simpler to always update submodule, even if not needed. - git_submodules=3D"${git_submodules} subprojects/dtc" - ;; -esac - ######################################## # check if ccache is interfering with # semantic analysis of macros @@ -1627,17 +1602,6 @@ write_target_makefile() { fi } =20 -########################################## -# check for vfio_user_server - -case "$vfio_user_server" in - enabled ) - if test "$git_submodules_action" !=3D "ignore"; then - git_submodules=3D"${git_submodules} subprojects/libvfio-user" - fi - ;; -esac - ####################################### # cross-compiled firmware targets =20 @@ -1971,12 +1935,10 @@ if test "$skip_meson" =3D no; then # QEMU options test "$cfi" !=3D false && meson_option_add "-Dcfi=3D$cfi" test "$docs" !=3D auto && meson_option_add "-Ddocs=3D$docs" - test "$fdt" !=3D auto && meson_option_add "-Dfdt=3D$fdt" test -n "${LIB_FUZZING_ENGINE+xxx}" && meson_option_add "-Dfuzzing_engin= e=3D$LIB_FUZZING_ENGINE" test "$qemu_suffix" !=3D qemu && meson_option_add "-Dqemu_suffix=3D$qemu= _suffix" test "$smbd" !=3D '' && meson_option_add "-Dsmbd=3D$smbd" test "$tcg" !=3D enabled && meson_option_add "-Dtcg=3D$tcg" - test "$vfio_user_server" !=3D auto && meson_option_add "-Dvfio_user_serv= er=3D$vfio_user_server" run_meson() { NINJA=3D$ninja $meson setup --prefix "$prefix" "$@" $cross_arg "$PWD" = "$source_path" } diff --git a/meson.build b/meson.build index 1a55039ff7c3..aa4ab1390fd2 100644 --- a/meson.build +++ b/meson.build @@ -3029,14 +3029,7 @@ endif =20 libvfio_user_dep =3D not_found if have_system and vfio_user_server_allowed - have_internal =3D fs.exists(meson.current_source_dir() / 'subprojects/li= bvfio-user/meson.build') - - if not have_internal - error('libvfio-user source not found - please pull git submodule') - endif - - libvfio_user_proj =3D subproject('libvfio-user') - + libvfio_user_proj =3D subproject('libvfio-user', required: true) libvfio_user_dep =3D libvfio_user_proj.get_variable('libvfio_user_dep') endif =20 @@ -3064,13 +3057,7 @@ if fdt_required.length() > 0 or fdt_opt =3D=3D 'enab= led' endif if not fdt.found() assert(fdt_opt =3D=3D 'internal') - have_internal =3D fs.exists(meson.current_source_dir() / 'subprojects/= dtc/meson.build') - - if not have_internal - error('libfdt source not found - please pull git submodule') - endif - - libfdt_proj =3D subproject('dtc', + libfdt_proj =3D subproject('dtc', required: true, default_options: ['tools=3Dfalse', 'yaml=3Dd= isabled', 'python=3Ddisabled', 'defau= lt_library=3Dstatic']) fdt =3D libfdt_proj.get_variable('libfdt_dep') diff --git a/meson_options.txt b/meson_options.txt index 972c458b80b4..635a2bfd351f 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -296,6 +296,7 @@ option('capstone', type: 'feature', value: 'auto', description: 'Whether and how to find the capstone library') option('fdt', type: 'combo', value: 'auto', choices: ['disabled', 'enabled', 'auto', 'system', 'internal'], + deprecated: { 'git': 'internal' }, description: 'Whether and how to find the libfdt library') =20 option('selinux', type: 'feature', value: 'auto', diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh index dba5ae05b67e..b99cb66e4122 100755 --- a/scripts/archive-source.sh +++ b/scripts/archive-source.sh @@ -26,8 +26,8 @@ sub_file=3D"${sub_tdir}/submodule.tar" # independent of what the developer currently has initialized # in their checkout, because the build environment is completely # different to the host OS. -submodules=3D"subprojects/dtc subprojects/keycodemapdb" -submodules=3D"$submodules tests/fp/berkeley-softfloat-3 tests/fp/berkeley-= testfloat-3" +subprojects=3D"dtc keycodemapdb libvfio-user" +submodules=3D"tests/fp/berkeley-softfloat-3 tests/fp/berkeley-testfloat-3" sub_deinit=3D"" =20 function cleanup() { @@ -70,4 +70,11 @@ for sm in $submodules; do tar --concatenate --file "$tar_file" "$sub_file" test $? -ne 0 && error "failed append submodule $sm to $tar_file" done + +for sp in $subprojects; do + meson subprojects download $sp + test $? -ne 0 && error "failed to download subproject $sp" + tar --append --file "$tar_file" --exclude=3D.git subprojects/$sp + test $? -ne 0 && error "failed to append subproject $sp to $tar_file" +done exit 0 diff --git a/scripts/make-release b/scripts/make-release index 44a9d86a04a7..0604e61b8143 100755 --- a/scripts/make-release +++ b/scripts/make-release @@ -16,6 +16,9 @@ if [ $# -ne 2 ]; then exit 0 fi =20 +# Only include wraps that are invoked with subproject() +SUBPROJECTS=3D"dtc libvfio-user keycodemapdb" + src=3D"$1" version=3D"$2" destination=3Dqemu-${version} @@ -26,6 +29,8 @@ git clone --single-branch -b "v${version}" -c advice.deta= chedHead=3Dfalse \ pushd ${destination} =20 git submodule update --init --single-branch +meson subprojects download $SUBPROJECTS + (cd roms/seabios && git describe --tags --long --dirty > .version) (cd roms/skiboot && ./make_version.sh > .version) # Fetch edk2 submodule's submodules, since it won't have access to them via diff --git a/subprojects/.gitignore b/subprojects/.gitignore index 7560ebb0b1a0..935e9a72a8f9 100644 --- a/subprojects/.gitignore +++ b/subprojects/.gitignore @@ -1,3 +1,6 @@ /packagecache =20 +/dtc +/keycodemapdb +/libvfio-user /slirp diff --git a/subprojects/dtc b/subprojects/dtc deleted file mode 160000 index b6910bec1161..000000000000 --- a/subprojects/dtc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b6910bec11614980a21e46fbccc35934b671bd81 diff --git a/subprojects/dtc.wrap b/subprojects/dtc.wrap new file mode 100644 index 000000000000..d1bc9174e913 --- /dev/null +++ b/subprojects/dtc.wrap @@ -0,0 +1,4 @@ +[wrap-git] +url =3D https://gitlab.com/qemu-project/dtc.git +revision =3D b6910bec11614980a21e46fbccc35934b671bd81 +depth =3D 1 diff --git a/subprojects/keycodemapdb b/subprojects/keycodemapdb deleted file mode 160000 index f5772a62ec52..000000000000 --- a/subprojects/keycodemapdb +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f5772a62ec52591ff6870b7e8ef32482371f22c6 diff --git a/subprojects/keycodemapdb.wrap b/subprojects/keycodemapdb.wrap new file mode 100644 index 000000000000..dda7b0e5716f --- /dev/null +++ b/subprojects/keycodemapdb.wrap @@ -0,0 +1,4 @@ +[wrap-git] +url =3D https://gitlab.com/qemu-project/keycodemapdb.git +revision =3D f5772a62ec52591ff6870b7e8ef32482371f22c6 +depth =3D 1 diff --git a/subprojects/libvfio-user b/subprojects/libvfio-user deleted file mode 160000 index 0b28d205572c..000000000000 --- a/subprojects/libvfio-user +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0b28d205572c80b568a1003db2c8f37ca333e4d7 diff --git a/subprojects/libvfio-user.wrap b/subprojects/libvfio-user.wrap new file mode 100644 index 000000000000..416955ca4515 --- /dev/null +++ b/subprojects/libvfio-user.wrap @@ -0,0 +1,4 @@ +[wrap-git] +url =3D https://gitlab.com/qemu-project/libvfio-user.git +revision =3D 0b28d205572c80b568a1003db2c8f37ca333e4d7 +depth =3D 1 --=20 2.40.1