From patchwork Mon Oct 18 09:23:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1542460 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=SmWlq3/K; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4HXs0M6fZvz9sS8 for ; Mon, 18 Oct 2021 20:24:51 +1100 (AEDT) Received: from localhost ([::1]:49924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcOsz-0000Pe-Mj for incoming@patchwork.ozlabs.org; Mon, 18 Oct 2021 05:24:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46790) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcOsG-0000MX-Kr for qemu-devel@nongnu.org; Mon, 18 Oct 2021 05:24:04 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:42545) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcOsF-00026L-8y for qemu-devel@nongnu.org; Mon, 18 Oct 2021 05:24:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1634549042; 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=rAmhMZZnEkb9CvDZ6qBB6my6BWS50uf0OXuFQh5HKPA=; b=SmWlq3/KQQLlOsyn05Nwyo7hcG6eBg3R8cZUkriWPijRckq7tywm4SbZOrk1arzZV9y2T0 J6gt/5Fad2QCSBHGExFi7Idj2eH3v41+nY3AMhavtSJdWvRWfGj8l+ZAI4Su34DOyJlFRl IXYWZaB1IZKNVF1wDsDQXJ5tpRUCqko= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-449-j_OcmRK0MwqxeCLlVPmGHA-1; Mon, 18 Oct 2021 05:24:01 -0400 X-MC-Unique: j_OcmRK0MwqxeCLlVPmGHA-1 Received: by mail-wm1-f71.google.com with SMTP id c69-20020a1c9a48000000b0030d95485d90so2964707wme.2 for ; Mon, 18 Oct 2021 02:24:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rAmhMZZnEkb9CvDZ6qBB6my6BWS50uf0OXuFQh5HKPA=; b=iYu0fR6mh3oreYuDQnpFHuRJpDFbt13cwNB/6747TregbzE5GWl0Hu3AzCmhqfvmmX +HViCEdv1aaTwFpkm8HgzGF7bbG3qvGQ8bnJJbfIF3SbID2iob9MmxfMnre0XFEkX8VJ fDpH9yAnpgtW+F7YsYSOvTisSWm4TEKit0WqHvKwpg6YTMR0m3DiwXnYeTuuEho5p2JQ EnK+yK9zhmPEc/5E3DWjO+VZe2uPA0w65nYPPFgcCzo1smSCHOIs4wjuKUpa0OFfdExh 9juYOpOo/XCA/6Ip7rGluQpsbG83Op7/6cIeLV8IIa0WPnP5Cb1iqwF7TkWVbkLgV9e8 Bqhw== X-Gm-Message-State: AOAM533Imive005F0cJkSw+gWKMOINmGy15iGcGwTWkmWJw1btf9gkrw ZMMuLVTLMDHP71tQ8PWYsvOGw317/nzzOzBRu+7DH6EkwxVBvU2z6sPlTmBLPCssT9FNO5hnOwc 0pwzl1KYDbYt4YPCWMGAT3DA5TPradoVB7B7vpgUUJLfBWU9loRPPHtL+QfDKjX8H X-Received: by 2002:a05:600c:4fd3:: with SMTP id o19mr28745729wmq.147.1634549040340; Mon, 18 Oct 2021 02:24:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwp+1mNA+YV0HImBYZPVH2Lz/78uatNE812w0w3DMWrtQs4jrN/v8pu3eZx5zUbpzU0lWKSvw== X-Received: by 2002:a05:600c:4fd3:: with SMTP id o19mr28745703wmq.147.1634549040063; Mon, 18 Oct 2021 02:24:00 -0700 (PDT) Received: from x1w.. (213.red-81-36-146.dynamicip.rima-tde.net. [81.36.146.213]) by smtp.gmail.com with ESMTPSA id s3sm11938884wrm.40.2021.10.18.02.23.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Oct 2021 02:23:59 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 1/2] roms/edk2: Only init brotli submodule to build BaseTools Date: Mon, 18 Oct 2021 11:23:53 +0200 Message-Id: <20211018092354.2637731-2-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211018092354.2637731-1-philmd@redhat.com> References: <20211018092354.2637731-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.049, 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_H2=-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: , Cc: Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Gerd Hoffmann , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Since EDK2 BaseTools only require the brotli submodule, we don't need to initialize other submodules at to build it. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- roms/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roms/Makefile b/roms/Makefile index eeb5970348c..b967b53bb76 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -143,7 +143,8 @@ build-efi-roms: build-pxe-roms # efirom # edk2-basetools: - cd edk2/BaseTools && git submodule update --init --force + cd edk2/BaseTools && git submodule update --init --force \ + Source/C/BrotliCompress/brotli $(MAKE) -C edk2/BaseTools \ PYTHON_COMMAND=$${EDK2_PYTHON_COMMAND:-python3} \ EXTRA_OPTFLAGS='$(EDK2_BASETOOLS_OPTFLAGS)' \ From patchwork Mon Oct 18 09:23:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1542468 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Tj7b8Lim; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4HXs403YmNz9sS8 for ; Mon, 18 Oct 2021 20:28:00 +1100 (AEDT) Received: from localhost ([::1]:54892 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcOw2-0003rC-14 for incoming@patchwork.ozlabs.org; Mon, 18 Oct 2021 05:27:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46820) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcOsL-0000Vs-QS for qemu-devel@nongnu.org; Mon, 18 Oct 2021 05:24:09 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:60438) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcOsK-0002Ar-3z for qemu-devel@nongnu.org; Mon, 18 Oct 2021 05:24:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1634549047; 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=YEzs5yuk7z6Czqe1zxqHN8b/ECZQ5elcsj5gvpYub1A=; b=Tj7b8Limnm/ghUzhHMK3tr2qdUxSAcoeObZYe9bvIAlIEHvfSufu3W4Q/8Kj5kx+/acroK F4cJlqLTfEsRZOfYS1bxYiKSqoqvQ9xZXx20S89oo4F5mQBWV2n7X/fwNDp6+3iRBEk2Wa 8OJmNlhEbx/FuVRJqmXBeN6+P4iGaLY= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-110-p6QnvASWPNqcQNtRKTjvtQ-1; Mon, 18 Oct 2021 05:24:06 -0400 X-MC-Unique: p6QnvASWPNqcQNtRKTjvtQ-1 Received: by mail-wm1-f69.google.com with SMTP id f20-20020a05600c155400b0030db7b29174so2665802wmg.2 for ; Mon, 18 Oct 2021 02:24:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YEzs5yuk7z6Czqe1zxqHN8b/ECZQ5elcsj5gvpYub1A=; b=E4IK6MR6nIvAV/nopDIWVGGA2ny0bqkHF8FJzQOlfC27AGIYggAbxw8RzOsXkHta8a lwA6MOfjiuVVfuMVlpk8Bn59etNNjdnj5Sx2QPPdQ64SNVkRpu3Wy6bbhOIxrXB/loZP vigiV0frt6kGVGy4zn4RI+bJ+qSHfaXKOlYVK+PlvFlCV1fg28WmNITvkQu/ccFr5wwK 7SewMIc7XqjujikjTtdRp/Cii62EUNN8QpsPRV2IrRkfUQIzfc+sJxHHCCe4bEU9EIRn CpySoC1PKioXCStTW24sN8oNS5sALaqH11McLG4dv8PWVYLUUnmTwGJNfiFudP7lCLs1 C+Tw== X-Gm-Message-State: AOAM533aFW+nVf3dw5qrYlNkzmtfXWVPfxGgy0/aPfLLgUVsKgouAtJg yIHC8nVei8B61Y+tQaAyPCdFUPfOA3jeUvq8oomu+d4mLNtPea5FJofM3WEWgA8RNlKTdzvW6II ZTJT5vImzDzoVq+OSh387DIqodVDiYRexdIrNNxAYM+/lephcy1LRf2JuJ0ltC74T X-Received: by 2002:a5d:6dae:: with SMTP id u14mr20889602wrs.46.1634549044652; Mon, 18 Oct 2021 02:24:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzORBet1gPv5KznTQ5Z3PwNe20sjcq+q91yVF/dhWF8ZNMQnR6uTK6tHVmRWJD3BIwM+D9/sw== X-Received: by 2002:a5d:6dae:: with SMTP id u14mr20889571wrs.46.1634549044374; Mon, 18 Oct 2021 02:24:04 -0700 (PDT) Received: from x1w.. (213.red-81-36-146.dynamicip.rima-tde.net. [81.36.146.213]) by smtp.gmail.com with ESMTPSA id k13sm7832252wrp.86.2021.10.18.02.24.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Oct 2021 02:24:04 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 2/2] roms/edk2: Only initialize required submodules Date: Mon, 18 Oct 2021 11:23:54 +0200 Message-Id: <20211018092354.2637731-3-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211018092354.2637731-1-philmd@redhat.com> References: <20211018092354.2637731-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.049, 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_H2=-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: , Cc: Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Gerd Hoffmann , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The EDK2 firmware images built to test QEMU do not require the following submodules: - MdeModulePkg/Universal/RegularExpressionDxe/oniguruma - UnitTestFrameworkPkg/Library/CmockaLib/cmocka The only submodules required are: - ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 - BaseTools/Source/C/BrotliCompress/brotli - CryptoPkg/Library/OpensslLib/openssl - MdeModulePkg/Library/BrotliCustomDecompressLib/brotli Adapt the buildsys machinery to only initialize the required submodules. Signed-off-by: Philippe Mathieu-Daudé --- .gitlab-ci.d/edk2.yml | 4 ++++ roms/Makefile.edk2 | 7 ++++++- scripts/make-release | 7 ++++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.d/edk2.yml b/.gitlab-ci.d/edk2.yml index 62497ba47fb..2f12939d744 100644 --- a/.gitlab-ci.d/edk2.yml +++ b/.gitlab-ci.d/edk2.yml @@ -51,6 +51,10 @@ build-edk2: script: # Clone the required submodules and build EDK2 - git submodule update --init roms/edk2 - git -C roms/edk2 submodule update --init + ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 + BaseTools/Source/C/BrotliCompress/brotli + CryptoPkg/Library/OpensslLib/openssl + MdeModulePkg/Library/BrotliCustomDecompressLib/brotli - export JOBS=$(($(getconf _NPROCESSORS_ONLN) + 1)) - echo "=== Using ${JOBS} simultaneous jobs ===" - make -j${JOBS} -C roms efi 2>&1 1>edk2-stdout.log | tee -a edk2-stderr.log >&2 diff --git a/roms/Makefile.edk2 b/roms/Makefile.edk2 index a8ed3255757..fdae0b511f5 100644 --- a/roms/Makefile.edk2 +++ b/roms/Makefile.edk2 @@ -51,7 +51,12 @@ all: $(foreach flashdev,$(flashdevs),../pc-bios/edk2-$(flashdev).fd.bz2) \ # make-release/tarball scripts. submodules: if test -d edk2/.git; then \ - cd edk2 && git submodule update --init --force; \ + cd edk2 && git submodule update --init --force -- \ + ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 \ + BaseTools/Source/C/BrotliCompress/brotli \ + CryptoPkg/Library/OpensslLib/openssl \ + MdeModulePkg/Library/BrotliCustomDecompressLib/brotli \ + ; \ fi # See notes on the ".NOTPARALLEL" target and the "+" indicator in diff --git a/scripts/make-release b/scripts/make-release index a2a8cda33c0..a9ff933a4ca 100755 --- a/scripts/make-release +++ b/scripts/make-release @@ -27,7 +27,12 @@ git submodule update --init # don't necessarily have much control over how a submodule handles its # submodule dependencies, so we continue to handle these on a case-by-case # basis for now. -(cd roms/edk2 && git submodule update --init) +(cd roms/edk2 && \ + git submodule update --init \ + ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 \ + BaseTools/Source/C/BrotliCompress/brotli \ + CryptoPkg/Library/OpensslLib/openssl \ + MdeModulePkg/Library/BrotliCustomDecompressLib/brotli) popd tar --exclude=.git -cjf ${destination}.tar.bz2 ${destination} rm -rf ${destination}