From nobody Mon Feb 9 02:05:41 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1634549043; cv=none; d=zohomail.com; s=zohoarc; b=ZL8RW6uzux3V9U7kSO3xgl2CnH2/7ZmTmJoq8VlVHL4kUyZgTUqeMLUiQsc6DL0QeL0Q0YAtAmB2tQgoqgX58kGsVRcVht56Ce5mQWqMMhwkmaWx7K0bCxgn4N6ZSC6h1CLlxpPVnKPeEjcU3kWklZ+n6tXeGJhV/lKXQjZxZlQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634549043; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=rAmhMZZnEkb9CvDZ6qBB6my6BWS50uf0OXuFQh5HKPA=; b=Qm/eguqD7OEL7MKPpCBd8kDLGOpjjX46StfU6c3vK/m249BxM9cn46U/aT6uDGrnid2Im3P6j4XC9XQdKzowTVI2ZKybkaU0DTqfSqm934OCEnwJi0B3UETtxKS7JmS/Dr3tM4KjCUm5P35epFcyJiA5iuoQb0nfKuH025019TA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1634549043662233.96838210738588; Mon, 18 Oct 2021 02:24:03 -0700 (PDT) Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-353-uNoMKIETPcafYIlhGr9JbQ-1; Mon, 18 Oct 2021 05:24:01 -0400 Received: by mail-wr1-f70.google.com with SMTP id 10-20020a5d47aa000000b001610cbda93dso8556245wrb.23 for ; Mon, 18 Oct 2021 02:24:01 -0700 (PDT) Return-Path: Return-Path: 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) 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= X-MC-Unique: uNoMKIETPcafYIlhGr9JbQ-1 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=n/0YjERSw3h0aJxPi4KLdcWZtKTkPYKiF51XPUtBpzrhcENnD2kSgz3qQUCoB14KWy Q+H6A0ulYTXYydRcIIc5hEtOyuch9a1JJ36x68YQzIDQmkJhV2LwnMA2mNxF9UT9eRCg L0ho226evnv/7T+8bKmZmqQIvqgL5plz+NHyDxh2XmCgwi3D94zlTsrfv818VtMDtZ+X XcitNPau6A2c1tPm2Ab/3zcSwTDTP3VMP8J1NI46KrdM26qSV4+jsf+UqbqwkbCA7OMP dg4g2smO5BJEn8Mp8BlfRQpQPmgoAwO7Khc3+d46I0uJr1wbvKM7zT/3pTINFjkF0OR/ TPiw== X-Gm-Message-State: AOAM532fodIMYpuIx8MMfSRzPx25Jy2+Q/DVVJWOl+zcDK2jDzdhZNhk WWQpZ1NXydraMZcwbJ0QAHMh7CRXXkF+JkIpWbr3J8zzXt1dgRMKTucyYhL6arjRFp0JNQAKZoT 4GGkyRymOA/+hDQ== X-Received: by 2002:a05:600c:4fd3:: with SMTP id o19mr28745743wmq.147.1634549040556; 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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Gerd Hoffmann , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1634549044770100001 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=C3=A9 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=3D$${EDK2_PYTHON_COMMAND:-python3} \ EXTRA_OPTFLAGS=3D'$(EDK2_BASETOOLS_OPTFLAGS)' \ --=20 2.31.1 From nobody Mon Feb 9 02:05:41 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1634549047; cv=none; d=zohomail.com; s=zohoarc; b=mqvGOBmTB61FhOoskuTBAkxTJZNImXcmnIgAAe16qQan9Q2Xq1XcgK1d896wTgSfTWfhcqTpDnJon3Zz7LbSTuS4Nv06KevJBk24eoV/78n621q5WAYqe3Gp8j9ABKA8PGCnY8LiZZKISIEd5/RdJPug2/6Lg9ktwEwC/xAGRMQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634549047; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=YEzs5yuk7z6Czqe1zxqHN8b/ECZQ5elcsj5gvpYub1A=; b=fryR6vXAknaF2k2A5M29gMf+E1y3PS/V9a2J9YtpJdBUFUmjk10aisCj+9YPrdpjyJMk7s0KLO94qTA7rZe1M7t/krTpJgytTQu21yctIhuqrRfcfp919mVRhrEVHjpzPS/LkwEUO82hIo4S6sm04XCecbMkgs9CGYxW+hm69ew= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1634549047914789.4799316646901; Mon, 18 Oct 2021 02:24:07 -0700 (PDT) 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-266-OwioOiAmNNiMNAmTr15Y7g-1; Mon, 18 Oct 2021 05:24:05 -0400 Received: by mail-wm1-f71.google.com with SMTP id z26-20020a05600c221a00b0030da55bc454so1927040wml.4 for ; Mon, 18 Oct 2021 02:24:05 -0700 (PDT) Return-Path: Return-Path: 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1634549046; 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=Arrt/O0iWP3GHgEZuziBgLIUxHsROMdUBfCr03PSojoACVma1NsvzC3I2NY1JbDNYFOXBd RJMgJhW6LziWcVlBDXuiVez9Y03Ke3Z9VX29z+4sskynnmMrI6pkTaJ7dbSy2xbOAofeqo 4QIcfgViipItzMqCGKg0RraV6e+qYOU= X-MC-Unique: OwioOiAmNNiMNAmTr15Y7g-1 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=Z69Dm3gezgIGoRARH/BWoKX9hQZdhV3YMeH4VCC9QCBOwl3ffXCYkFHmjfbbjO9GB6 RdTsmWpdPb/nRNyr1vKypZjLPKO0cylBhsHUR6lh2qCvf4R5kVklyFl2TEJypjwGThr5 /1t/1Q4k/rYul7UGv+eyndHvkJbqWZQanIbETgBuULjYKvBgl4QTZc5CuVa82QHJ8xey rTXKyoq93PJeStuL9AP+nPqdfmEt3PKehtb9y7RKms9vm9Q0wHPJ1YhUydgUsURTqEL6 EHHisf2wJM17dQSRJPsHUY1/XC8/B/jkNacppncVnh7VV6YriAPMrIDgm/KRpEQ3uBlj c/NA== X-Gm-Message-State: AOAM5308Gny7Sd+2X+MQMhcVEYJSUlmMesm0kt8MhoGPMAZ136gqdLa/ Hr7NGy29iaxardbRUDeZSuXpkUEffTlN2345HomEa7K8/M5tV13dFGdQUFCjoXuJDDskVSJCyaI 5E91tzgyi43eGTg== X-Received: by 2002:a5d:6dae:: with SMTP id u14mr20889588wrs.46.1634549044533; 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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Gerd Hoffmann , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1634549049189100001 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=C3=A9 --- .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=3D$(($(getconf _NPROCESSORS_ONLN) + 1)) - echo "=3D=3D=3D Using ${JOBS} simultaneous jobs =3D=3D=3D" - 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-$(f= lashdev).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 =20 # 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=3D.git -cjf ${destination}.tar.bz2 ${destination} rm -rf ${destination} --=20 2.31.1