From nobody Wed May 15 20:09:09 2024 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=1634554705; cv=none; d=zohomail.com; s=zohoarc; b=NFZNtQOY1+5WICdKNdtEkIpiQh9OXlGf2kbBLihEZeimddprnBvyF87GT10gpuwwe65cMy+PpJ8uX0yR4J6KznyJR61qyGRmI7G0h7kDBvzp02uvfQurPsdpsJJAaIjIbKqxXb+WCAXJAogzTOSt80N5++cueuuzy/W9sA7xAQ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634554705; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=Qmh3hhZAGjAIiECvnjskGm/Ts0gmnqZa3vJcYXBgjMs=; b=SrK7oswq+dCtgg3DYLQE8zbQclAj55x73oapYDX6lBRiTfr79e26Sxt7SGpPODpJiSP+/Ku46F/AzPgQ31LsNaLSRdCjZ9dbgN7DFSOqqdAbnHB93keDvHKuvSHd+LEk8DokLeXgLf0xjRZTP38k4hgjku0h8lYhwlcV3AepFAk= 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 163455470581143.18096942950581; Mon, 18 Oct 2021 03:58:25 -0700 (PDT) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-549-fP--jJjSPKiISSJP3YzIdg-1; Mon, 18 Oct 2021 06:58:23 -0400 Received: by mail-wr1-f69.google.com with SMTP id l8-20020a5d6d88000000b001611b5de796so8701273wrs.10 for ; Mon, 18 Oct 2021 03:58:23 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (213.red-81-36-146.dynamicip.rima-tde.net. [81.36.146.213]) by smtp.gmail.com with ESMTPSA id t4sm12189985wro.1.2021.10.18.03.58.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Oct 2021 03:58:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1634554704; 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=Qmh3hhZAGjAIiECvnjskGm/Ts0gmnqZa3vJcYXBgjMs=; b=B4K5d5aqt6s5aXojl7IjZKZD1cnPH6tLOACnCHTlPUePDUHH1zJDoNu3I9XkAu1+EcmhXS 8UjVAgLigdYP0h5wSupC8z4JOGZU4MIDeYW1lVOTXRYzaU4bpRyDMwLK/l34RfPcRonCNg ufcY4O+uwzZNbZq50X/LJgzj4gfJIOo= X-MC-Unique: fP--jJjSPKiISSJP3YzIdg-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=Qmh3hhZAGjAIiECvnjskGm/Ts0gmnqZa3vJcYXBgjMs=; b=b/DIvRquH1yuqtG8kxDPSJRP3NqhnunGndVgieDJx8Ue2Xiu5AHA9WiriTyfqMla8L XoobsNfmPeN2NPR+VWfh4nbDu1VYErpUy2UKugtrkrgV80PUQ/T3Vmkd5N8m3YJBouM3 ysNHo09B00uyiN4lsRyZDRS1bZXtFSroaaACGBIfohefuPrucnRyrVMi0z3k5F7r4MJY R37XuNulJX2Qcy78c/R/OdqExtXZmYb8VhNP60WB/VMswX0KIDMGqqm9eMIckQTn7Znk epxOCh0rwQR6+PF4zHHIV2raHlwg4pxwM3iuGknrb2octqkKdxhJnu6MOGB428k4cwJu sAkw== X-Gm-Message-State: AOAM530G3SPT+2HxU2rHNXWFa/m1fLZe07YRCf9J+PdJYiqFXgFmMA0R ubrRlHkgthhf8aLCPSRJsSm2itMkKjyL8nAJf1iILT9f7VOq51HPCVc93CLN3uTL9SxXIE4l65r MlXE1ExGuuBIryg== X-Received: by 2002:adf:a118:: with SMTP id o24mr34418802wro.15.1634554702627; Mon, 18 Oct 2021 03:58:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxCCNcJDzul/SBGo97OTF88AagEP1UfCKABYHdjHUA0iOTJAR+MG1q5825pJsTW1IsbFzGRDg== X-Received: by 2002:adf:a118:: with SMTP id o24mr34418777wro.15.1634554702446; Mon, 18 Oct 2021 03:58:22 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Gerd Hoffmann , Michael Roth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 1/2] roms/edk2: Only init brotli submodule to build BaseTools Date: Mon, 18 Oct 2021 12:58:15 +0200 Message-Id: <20211018105816.2663195-2-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211018105816.2663195-1-philmd@redhat.com> References: <20211018105816.2663195-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: 1634554707114100001 Since EDK2 BaseTools only require the brotli submodule, we don't need to initialize other submodules to build it. Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Gerd Hoffmann Tested-by: Richard Henderson --- 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 Wed May 15 20:09:09 2024 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=1634554710; cv=none; d=zohomail.com; s=zohoarc; b=ns23FnIY8jfDXLcN40Kymrvvr2TutMlLabOI76bqYaE1S9hCHCSwOO9BIqeKmqlqCPrbAlZkbouc5LN8p3ZZHQtxjIL6wwhbcuRAZrYYPDMYMWRvm4yu/EJzFP434qkjRkKgUakA7K2Ur/aDtRcU6b64IG8eKnxjNiZsoB414+U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634554710; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=Xx3f/mYVwEOTtmXB5LHuSDZ24Zf6Va4xyRPf3h7Vlpw=; b=es+x2JwifqU/qV6iCS4bytAmde/tv/kQW44+hUOvLtFKWU9hn1A+9M5bdj21TW5HXAilvLaKfXP3mkIT9VQ+Ougy+j01sfqrhRsMntHRlxLchjlGkTNVP9+pI1eHMMyOKXYb+mjyCpfWRU+TRWRmGSxXU5T6FBQOKL+AJ77gi4c= 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 1634554710731833.6143121042052; Mon, 18 Oct 2021 03:58:30 -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-433-Cy24kCxrOl2WGVDEGYDGCw-1; Mon, 18 Oct 2021 06:58:28 -0400 Received: by mail-wm1-f71.google.com with SMTP id c69-20020a1c9a48000000b0030d95485d90so3041469wme.2 for ; Mon, 18 Oct 2021 03:58:28 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (213.red-81-36-146.dynamicip.rima-tde.net. [81.36.146.213]) by smtp.gmail.com with ESMTPSA id k6sm12597727wri.83.2021.10.18.03.58.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Oct 2021 03:58:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1634554709; 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=Xx3f/mYVwEOTtmXB5LHuSDZ24Zf6Va4xyRPf3h7Vlpw=; b=gEui8H2V2AnIS7xfsCldct51OPw2nlfT4JonhMEDhwedbQhzehR5Nyex3ZHNCTRQqQDO0H Gcvl4bDpotWiUtK8hI8NiAXaHcIpYJXnSWDgqix3Jowd7f7YQU7vGDSxLWTC9ba/lpg0uR xDhSoo/7E7nzgtbz4Ki6FbTtnoHg4nk= X-MC-Unique: Cy24kCxrOl2WGVDEGYDGCw-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=Xx3f/mYVwEOTtmXB5LHuSDZ24Zf6Va4xyRPf3h7Vlpw=; b=faLlRZnd/EfxLzbZ6tJAssAY4OR7CxhxC73jtHpxC7ZYvW4/qihUgHdq/4j9jZRNjj 4NgexGhNPBo56FMKHX7xmy4bzVJfG0Vg+jq+4pFiXteYU8RJ1DfcM4GD4eFKEjN0pXF5 fxayuihEoB5gpX6DWg6eUJTNorQopXXTkYTUj7fNe62tcUCuuMLdV+0v/ls8+zw5WsHO 1pS7q6tgcSCwDrQnEcmMy7rxozUNEKjQIyjHgrrwmg1xYs9mBXe7IkFBxUIwBNittFBr C3jBw6S8b9VVqa9/7hu0t8lyyksOGeu4sZMZzbqg2c22v6S40qn/IpGz6snbSXQcIM6Z RB6A== X-Gm-Message-State: AOAM531wAHohGTRCFpoVCG+AMTJxo8vWw3NbopWBNiSjHPbFYjCaMVfZ fzcgLU/0RkVjRTHNpeDNk9P5kzWYMk0VOkUbXle2U9ajPuhdRVtDWqoaKo90yP6ryu4AW4Takjg vGPwsPS+Ee7DU0g== X-Received: by 2002:a05:6000:1885:: with SMTP id a5mr33606980wri.64.1634554707117; Mon, 18 Oct 2021 03:58:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwWNIIbvRjf/CKzuMzzl/lRwTXkfxm/CKlR8Ix6FzqDmuCS2R+bKw75xxqH9ZzaJnWnY03xAQ== X-Received: by 2002:a05:6000:1885:: with SMTP id a5mr33606956wri.64.1634554706954; Mon, 18 Oct 2021 03:58:26 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Gerd Hoffmann , Michael Roth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 2/2] roms/edk2: Only initialize required submodules Date: Mon, 18 Oct 2021 12:58:16 +0200 Message-Id: <20211018105816.2663195-3-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211018105816.2663195-1-philmd@redhat.com> References: <20211018105816.2663195-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: 1634554711489100001 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 Reviewed-by: Gerd Hoffmann Tested-by: Richard Henderson --- Cc: Michael Roth --- .gitlab-ci.d/edk2.yml | 6 +++++- roms/Makefile.edk2 | 7 ++++++- scripts/make-release | 7 ++++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.d/edk2.yml b/.gitlab-ci.d/edk2.yml index 62497ba47fb..13d0f8b019f 100644 --- a/.gitlab-ci.d/edk2.yml +++ b/.gitlab-ci.d/edk2.yml @@ -50,7 +50,11 @@ build-edk2: GIT_DEPTH: 3 script: # Clone the required submodules and build EDK2 - git submodule update --init roms/edk2 - - git -C roms/edk2 submodule update --init + - 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..05b14ecc95e 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