From nobody Thu May 16 21:37:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+89060+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+89060+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1650353725; cv=none; d=zohomail.com; s=zohoarc; b=kPH7xGe3NpDGoYdNKGHl33y/PNSgLEVKkvbki7+Voyi0Z+glwIDfvigLxiqpI4onS20qKnSgqPujqwDJxD11HslWpPPj7tDDC0gETArLMx+CY06kZC4e5PcLTtduDckf9CoNntJEzqENAA821D0u7uNwY8YwDzgtI6rpb+IPqgM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1650353725; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=rbhEVt87wNl2/kxg+HLZRKitmRF4lQDk61Osps0zxik=; b=C4Csg31HouWiQKFhWLHq1Be3VX5bd3Xe/xwHUTKg+IHfRmE4DF57cuvxkU5rG9CxDmySu4bf+bnObeCbo6AOp2/2TT3998PrcxW3+V2JXXvZqWb9IftKUtGmYBDic1v51mVjVZVoTHN+JhjVCmly05l30BtStNMCjJbrgl8egX4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+89060+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 165035372559685.60103448944756; Tue, 19 Apr 2022 00:35:25 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id FJ30YY1788612xv0Fb9WRkNS; Tue, 19 Apr 2022 00:35:24 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web08.1622.1650353724077278353 for ; Tue, 19 Apr 2022 00:35:24 -0700 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-206--z11Zaz0NFiKIyup3-kMZg-1; Tue, 19 Apr 2022 03:35:17 -0400 X-MC-Unique: -z11Zaz0NFiKIyup3-kMZg-1 X-Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5F81B802809; Tue, 19 Apr 2022 07:35:16 +0000 (UTC) X-Received: from osteffen-laptop.fritz.box (unknown [10.39.192.173]) by smtp.corp.redhat.com (Postfix) with ESMTP id D1AA2145F94B; Tue, 19 Apr 2022 07:35:13 +0000 (UTC) From: "Oliver Steffen" To: osteffen@redhat.com Cc: afish@apple.com, ardb+tianocore@kernel.org, bob.c.feng@intel.com, Bret.Barkelew@microsoft.com, devel@edk2.groups.io, gaoliming@byosoft.com.cn, jiewen.yao@intel.com, jordan.l.justen@intel.com, kraxel@redhat.com, michael.d.kinney@intel.com, quic_llindhol@quicinc.com, ray.ni@intel.com, sami.mujawar@arm.com, sean.brogan@microsoft.com, yuwei.chen@intel.com Subject: [edk2-devel] [PATCH 1/4] CI: don't force python verison (Linux only) Date: Tue, 19 Apr 2022 09:34:45 +0200 Message-Id: <20220419073448.165566-2-osteffen@redhat.com> In-Reply-To: <20220419073448.165566-1-osteffen@redhat.com> References: <20220419073448.165566-1-osteffen@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,osteffen@redhat.com X-Gm-Message-State: C4SbWLcGwyFIrADZo5A3JaN5x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1650353724; bh=NEFSKCI6XoGnCGZ3eTh62zxLUZUvmp4mc/H+4shoK4k=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=AOLmSysXEV7ESj9U9wmvW05f8sqa8XbVttox6cRo1vixO/fX4baazMambk6N6FgD80/ qAxBmmsl/tJxAhksyP5iI6/xAd5uayvcVYX+i5g3KJElN2vb18LQO0vtDE+mDhi3Y3Gua 8uKCqu06hrF2cNkN0WM7jU03iQwvMis9yAA= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1650353727081100006 Content-Type: text/plain; charset="utf-8"; x-default="true" Use the Python supplied by the container image. Signed-off-by: Oliver Steffen Acked-by: Ard Biesheuvel --- .azurepipelines/templates/platform-build-run-steps.yml | 1 + .azurepipelines/templates/pr-gate-steps.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.azurepipelines/templates/platform-build-run-steps.yml b/.azur= epipelines/templates/platform-build-run-steps.yml index 97e7faa26682..b0219bc61e67 100644 --- a/.azurepipelines/templates/platform-build-run-steps.yml +++ b/.azurepipelines/templates/platform-build-run-steps.yml @@ -44,6 +44,7 @@ steps: inputs: versionSpec: "3.8.x" architecture: "x64" + condition: not(eq('${{ parameters.tool_chain_tag }}', 'GCC5')) =20 - script: pip install -r pip-requirements.txt --upgrade displayName: 'Install/Upgrade pip modules' diff --git a/.azurepipelines/templates/pr-gate-steps.yml b/.azurepipelines/= templates/pr-gate-steps.yml index 70c19a462194..f5cf5ff0376f 100644 --- a/.azurepipelines/templates/pr-gate-steps.yml +++ b/.azurepipelines/templates/pr-gate-steps.yml @@ -22,6 +22,7 @@ steps: inputs: versionSpec: '3.8.x' architecture: 'x64' + condition: not(eq('${{ parameters.tool_chain_tag }}', 'GCC5')) =20 - script: pip install -r pip-requirements.txt --upgrade displayName: 'Install/Upgrade pip modules' --=20 2.35.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#89060): https://edk2.groups.io/g/devel/message/89060 Mute This Topic: https://groups.io/mt/90557212/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Thu May 16 21:37:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+89059+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+89059+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1650353724; cv=none; d=zohomail.com; s=zohoarc; b=em5Mler+g47J/uSx/8HxoVTFjGdca/Ese+IVxvebEzJwYEj64HQ0mpcu7aLvDUEJE9dcQeOrE92WHvdHJYuaEocI/ag5o/vMjxue5c08akvfGo9KRpCe3ydUS2R9YfyAyL/vRMutdXMIgLkl/YRRrswy5JCVd5xpaGqcurustB4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1650353724; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=EdKA8jUBITwYmIrhjAnF9QibFeoIxmscFSaCBbi3VDE=; b=FS18E9fzTHh3GaZiMXACU3apxbRCDbuVU2/HSK+aJ1oogz1YUvN/mh+IyGyKHomdYeXuPVoVDYmwg3etJWaEgCXHYtvo1abAiC1JSVFYXh6/YFDdEAMIEPkRXrC4P2mHEN5rdsjpxOOf6KJx29RwKsX95NOMzSXnCS2i0OAqTtM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+89059+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1650353724758104.26029621018643; Tue, 19 Apr 2022 00:35:24 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id K76IYY1788612xYU3OW7yPhx; Tue, 19 Apr 2022 00:35:24 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web08.1621.1650353723137100672 for ; Tue, 19 Apr 2022 00:35:23 -0700 X-Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-549-0Z2TMDx0NmK5G_e9L_Y6OQ-1; Tue, 19 Apr 2022 03:35:21 -0400 X-MC-Unique: 0Z2TMDx0NmK5G_e9L_Y6OQ-1 X-Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8D71E3C18520; Tue, 19 Apr 2022 07:35:20 +0000 (UTC) X-Received: from osteffen-laptop.fritz.box (unknown [10.39.192.173]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0F730145D493; Tue, 19 Apr 2022 07:35:17 +0000 (UTC) From: "Oliver Steffen" To: osteffen@redhat.com Cc: afish@apple.com, ardb+tianocore@kernel.org, bob.c.feng@intel.com, Bret.Barkelew@microsoft.com, devel@edk2.groups.io, gaoliming@byosoft.com.cn, jiewen.yao@intel.com, jordan.l.justen@intel.com, kraxel@redhat.com, michael.d.kinney@intel.com, quic_llindhol@quicinc.com, ray.ni@intel.com, sami.mujawar@arm.com, sean.brogan@microsoft.com, yuwei.chen@intel.com Subject: [edk2-devel] [PATCH 2/4] CI: add ~/.local/bin to PATH (Linux only) Date: Tue, 19 Apr 2022 09:34:46 +0200 Message-Id: <20220419073448.165566-3-osteffen@redhat.com> In-Reply-To: <20220419073448.165566-1-osteffen@redhat.com> References: <20220419073448.165566-1-osteffen@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,osteffen@redhat.com X-Gm-Message-State: jDMZynCtHbaHUzUMxjIMNuBBx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1650353724; bh=y04VeWjY2bUuEB2BvD/CxjLdZxSnHBZEMp4rcoSff4M=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=X/RmRhOPtZO1+9HSf0dOZSFhyM+w54JSrlmfRenkP8GZGfZWLIoFs+xqF4ZsrWrvoIA /BeppM5V2djfFCqffukK4bA3VGZxWNvYGPttrGLt4tCb4oSf2gWDxb5fM+1RXBRMwoC0j dUaLVXLnyqh4V5c5dPRMws6yVO/yTXEW/c8= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1650353725067100002 Content-Type: text/plain; charset="utf-8"; x-default="true" Fix pip install. Signed-off-by: Oliver Steffen Acked-by: Ard Biesheuvel --- .azurepipelines/templates/platform-build-run-steps.yml | 6 ++++++ .azurepipelines/templates/pr-gate-steps.yml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/.azurepipelines/templates/platform-build-run-steps.yml b/.azur= epipelines/templates/platform-build-run-steps.yml index b0219bc61e67..9d27f49a2b40 100644 --- a/.azurepipelines/templates/platform-build-run-steps.yml +++ b/.azurepipelines/templates/platform-build-run-steps.yml @@ -36,6 +36,12 @@ parameters: default: [] =20 steps: +- bash: | + echo "##vso[task.prependpath]${HOME}/.local/bin" + echo "new PATH=3D${PATH}" + displayName: Set PATH + condition: eq('${{ parameters.tool_chain_tag }}', 'GCC5') + - checkout: self clean: true fetchDepth: 1 diff --git a/.azurepipelines/templates/pr-gate-steps.yml b/.azurepipelines/= templates/pr-gate-steps.yml index f5cf5ff0376f..b78d2c4fff5d 100644 --- a/.azurepipelines/templates/pr-gate-steps.yml +++ b/.azurepipelines/templates/pr-gate-steps.yml @@ -14,6 +14,12 @@ parameters: build_archs: '' =20 steps: +- bash: | + echo "##vso[task.prependpath]${HOME}/.local/bin" + echo "new PATH=3D${PATH}" + displayName: Set PATH + condition: eq('${{ parameters.tool_chain_tag }}', 'GCC5') + - checkout: self clean: true fetchDepth: 1 --=20 2.35.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#89059): https://edk2.groups.io/g/devel/message/89059 Mute This Topic: https://groups.io/mt/90557211/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Thu May 16 21:37:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+89061+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+89061+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1650353729; cv=none; d=zohomail.com; s=zohoarc; b=MVxOJcGn2iEIO5+vJJjwMykF9aKz/sZA2aZzkXmM3CvevG2ycEmmLG3cx8UorPbyeNaFHckL/BdZH5/UR6cTRcCR5ZUH9hdVIH9rVee3giupKRNmX01YefXdS0QXnfURODmodwyHHBUboQWZBWXIT5EGwsUTYLM26da7tQ9gcRU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1650353729; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=pIRJX8BFrEnlUSVMrz91pwkprLAx7gqkn2tDHtYWTao=; b=aBUgGu9eKMMF4eMmCZ9/7d0WVkA3iKLTEBuUJZo3VI1+atvclZ4EpVD9g8ayzs2smtZt91nc49wmARFDcA33KDz+OsvN6Vlh0zuoo8vMWeGjy21vgxqo3NfuezgzlnjbXp8CkyIOkAwitfYJplzGWOtt8vRbB65hRGcHl5HDcoE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+89061+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1650353729847822.7214638286734; Tue, 19 Apr 2022 00:35:29 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id g77fYY1788612xOxxxtvxXXt; Tue, 19 Apr 2022 00:35:29 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web11.1586.1650353727948406897 for ; Tue, 19 Apr 2022 00:35:28 -0700 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-460-H99ewF9jOJW6b_-DdJTSWw-1; Tue, 19 Apr 2022 03:35:24 -0400 X-MC-Unique: H99ewF9jOJW6b_-DdJTSWw-1 X-Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 374C9811E75; Tue, 19 Apr 2022 07:35:23 +0000 (UTC) X-Received: from osteffen-laptop.fritz.box (unknown [10.39.192.173]) by smtp.corp.redhat.com (Postfix) with ESMTP id CBCD11454535; Tue, 19 Apr 2022 07:35:20 +0000 (UTC) From: "Oliver Steffen" To: osteffen@redhat.com Cc: afish@apple.com, ardb+tianocore@kernel.org, bob.c.feng@intel.com, Bret.Barkelew@microsoft.com, devel@edk2.groups.io, gaoliming@byosoft.com.cn, jiewen.yao@intel.com, jordan.l.justen@intel.com, kraxel@redhat.com, michael.d.kinney@intel.com, quic_llindhol@quicinc.com, ray.ni@intel.com, sami.mujawar@arm.com, sean.brogan@microsoft.com, yuwei.chen@intel.com Subject: [edk2-devel] [PATCH 3/4] CI: Use Fedora 35 container (Linux only) Date: Tue, 19 Apr 2022 09:34:47 +0200 Message-Id: <20220419073448.165566-4-osteffen@redhat.com> In-Reply-To: <20220419073448.165566-1-osteffen@redhat.com> References: <20220419073448.165566-1-osteffen@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,osteffen@redhat.com X-Gm-Message-State: rF7SSxSBpBStDy1ivBkoBF7Vx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1650353729; bh=BlHqXMTxxa25utIdBAvk1xR1bSiem3W9Kx179fxVhx0=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=moSuOf2cUui//4MBFtMaOsrhT6ybAKBYPpIgeW8JV2YoUKygvXenGDDdu9y1fApq2Qn 85CpmsgP5AXHr4nv5AqB4zo5a6j5yXr+UkvzJHSd59ChBh1T7CbAGae8VeBFb0HKbhru9 4svIHUooiFC62AEiLq0zACJt5NGJmmGjoaY= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1650353731080100002 Content-Type: text/plain; charset="utf-8"; x-default="true" Run all Linux based jobs in a container, using a custom Fedora 35 image (gcc 11). The image is hosted on ghcr.io and the container-files are here: https://github.com/osteffenrh/edk2-build-images. Do not run apt-get to install qemu and gcc dependencies. Assume the container image provides these. Signed-off-by: Oliver Steffen Acked-by: Ard Biesheuvel --- .azurepipelines/templates/basetools-build-steps.yml | 9 --------- .azurepipelines/templates/pr-gate-build-job.yml | 3 +++ ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml | 6 ++---- EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml | 2 ++ OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml | 6 ++---- 5 files changed, 9 insertions(+), 17 deletions(-) diff --git a/.azurepipelines/templates/basetools-build-steps.yml b/.azurepi= pelines/templates/basetools-build-steps.yml index d8c108c6e212..a72758bc3395 100644 --- a/.azurepipelines/templates/basetools-build-steps.yml +++ b/.azurepipelines/templates/basetools-build-steps.yml @@ -10,15 +10,6 @@ parameters: tool_chain_tag: '' =20 steps: -- ${{ if contains(parameters.tool_chain_tag, 'GCC') }}: - - bash: sudo apt-get update - displayName: Update apt - condition: and(gt(variables.pkg_count, 0), succeeded()) - - - bash: sudo apt-get install gcc g++ make uuid-dev - displayName: Install required tools - condition: and(gt(variables.pkg_count, 0), succeeded()) - - task: CmdLine@1 displayName: Build Base Tools from source inputs: diff --git a/.azurepipelines/templates/pr-gate-build-job.yml b/.azurepipeli= nes/templates/pr-gate-build-job.yml index 69e4c50afdbb..716664391957 100644 --- a/.azurepipelines/templates/pr-gate-build-job.yml +++ b/.azurepipelines/templates/pr-gate-build-job.yml @@ -63,6 +63,9 @@ jobs: pool: vmImage: ${{ parameters.vm_image }} =20 + ${{ if contains(parameters.tool_chain_tag, 'GCC') }} + container: 'ghcr.io/osteffenrh/edk2-build-images/fedora-35:latest' + steps: - template: pr-gate-steps.yml parameters: diff --git a/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml b/ArmVir= tPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml index b07e3199f143..a0a79b7108c9 100644 --- a/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml +++ b/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml @@ -75,6 +75,8 @@ jobs: pool: vmImage: $(vm_image) =20 + container: 'ghcr.io/osteffenrh/edk2-build-images/fedora-35:latest' + steps: - template: ../../../.azurepipelines/templates/platform-build-run-step= s.yml parameters: @@ -85,7 +87,3 @@ jobs: build_file: $(Build.File) build_flags: $(Build.Flags) run_flags: $(Run.Flags) - extra_install_step: - - bash: sudo apt-get install qemu - displayName: Install qemu - condition: and(gt(variables.pkg_count, 0), succeeded()) diff --git a/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml b/Emula= torPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml index 416c15e70840..589eea7d1985 100644 --- a/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml +++ b/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml @@ -75,6 +75,8 @@ jobs: pool: vmImage: $(vm_image) =20 + container: 'ghcr.io/osteffenrh/edk2-build-images/fedora-35:latest' + steps: - template: ../../../.azurepipelines/templates/platform-build-run-step= s.yml parameters: diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml b/OvmfPkg/P= latformCI/.azurepipelines/Ubuntu-GCC5.yml index 6dec90d9fcaf..45a97cd246f7 100644 --- a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml +++ b/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml @@ -166,6 +166,8 @@ jobs: pool: vmImage: $(vm_image) =20 + container: 'ghcr.io/osteffenrh/edk2-build-images/fedora-35:latest' + steps: - template: ../../../.azurepipelines/templates/platform-build-run-step= s.yml parameters: @@ -176,7 +178,3 @@ jobs: build_file: $(Build.File) build_flags: $(Build.Flags) run_flags: $(Run.Flags) - extra_install_step: - - bash: sudo apt-get install qemu - displayName: Install qemu - condition: and(gt(variables.pkg_count, 0), succeeded()) --=20 2.35.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#89061): https://edk2.groups.io/g/devel/message/89061 Mute This Topic: https://groups.io/mt/90557213/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Thu May 16 21:37:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+89062+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+89062+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1650353733; cv=none; d=zohomail.com; s=zohoarc; b=a3ZF6GnWNyMsPPC3VxYpXUA+wtgWw+l222OdfxlDUWm93/89iA7LCpp0cm7uOwWGCzDReXuFiMthYtZp0VrXco6CK/KdoyWo0aQNNN42V5NfNx3HsSkrXhNgMn48ONbkkDpOTAhLB+3a0wLsJ03mkQ/Vjd4HuO3C3lzZFYENKg0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1650353733; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=cEcQFYYREzOsureFkal7zcLTHxJYIbx320qMznsAGn0=; b=CMvxCtIbfnrqhXmfm4lTtMoGx8hK2Uj0SwAjCZ9HKAJnH3SESao0zY8e9hf3qcKUDCf2CD4At0QpSLxCJ/XKfXgoxroMIVWCuyTTOSliQcmRIHqPROUioPWtnuKwSJrtoO6x2Um5Fz4A1fyHMyrM1CXgCqOND29vvJ9L+YoVkzA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+89062+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1650353733507502.53497743671187; Tue, 19 Apr 2022 00:35:33 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id HN4vYY1788612xHB806L5uwt; Tue, 19 Apr 2022 00:35:33 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web11.1587.1650353732382785343 for ; Tue, 19 Apr 2022 00:35:32 -0700 X-Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-634-IQeNmDyCMGa7m_Spd9C7fA-1; Tue, 19 Apr 2022 03:35:26 -0400 X-MC-Unique: IQeNmDyCMGa7m_Spd9C7fA-1 X-Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CA8061C05EB9; Tue, 19 Apr 2022 07:35:25 +0000 (UTC) X-Received: from osteffen-laptop.fritz.box (unknown [10.39.192.173]) by smtp.corp.redhat.com (Postfix) with ESMTP id 73E461454535; Tue, 19 Apr 2022 07:35:23 +0000 (UTC) From: "Oliver Steffen" To: osteffen@redhat.com Cc: afish@apple.com, ardb+tianocore@kernel.org, bob.c.feng@intel.com, Bret.Barkelew@microsoft.com, devel@edk2.groups.io, gaoliming@byosoft.com.cn, jiewen.yao@intel.com, jordan.l.justen@intel.com, kraxel@redhat.com, michael.d.kinney@intel.com, quic_llindhol@quicinc.com, ray.ni@intel.com, sami.mujawar@arm.com, sean.brogan@microsoft.com, yuwei.chen@intel.com Subject: [edk2-devel] [PATCH 4/4] BaseTools: Remove ext. gcc dependencies (Linux only) Date: Tue, 19 Apr 2022 09:34:48 +0200 Message-Id: <20220419073448.165566-5-osteffen@redhat.com> In-Reply-To: <20220419073448.165566-1-osteffen@redhat.com> References: <20220419073448.165566-1-osteffen@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,osteffen@redhat.com X-Gm-Message-State: x3G9DQeNarqCWhSfNlmjyfTFx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1650353733; bh=kZOWLUBzXLsh4nq9p8E0PPfJe93eSCVQPgqFRsiPy0w=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=iF4MyQNM9QOkvcTSj4UtJOglMOYMyXxLys8nObp5witAMXcm0PLVwRnlsajIv8Y6PWu Ly+v10bxZLO93pg7ms880dhWrTqdEqJ97EgOAXwYs+ydMx8ufonHU+hbVuffUqhA5At5K LewqpTPe0POQfQp5M02VJ86IuFONZDf2b/o= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1650353735105100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Remove BaseTools/Bin/gcc*_linux_ext_dep.yaml to stop downloading gcc from external locations; use the toolchains provided by the container image instead. The image needs to set the GCC5_*_PREFIX accordingly. Signed-off-by: Oliver Steffen Acked-by: Ard Biesheuvel --- BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml | 21 ------------------ BaseTools/Bin/gcc_arm_linux_ext_dep.yaml | 21 ------------------ .../Bin/gcc_riscv64_unknown_ext_dep.yaml | 22 ------------------- 3 files changed, 64 deletions(-) delete mode 100644 BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml delete mode 100644 BaseTools/Bin/gcc_arm_linux_ext_dep.yaml delete mode 100644 BaseTools/Bin/gcc_riscv64_unknown_ext_dep.yaml diff --git a/BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml b/BaseTools/Bin/g= cc_aarch64_linux_ext_dep.yaml deleted file mode 100644 index ff8a9e868100..000000000000 --- a/BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml +++ /dev/null @@ -1,21 +0,0 @@ -## @file -# Download GCC AARCH64 compiler from Arm's release site -# Set shell variable GCC5_AARCH64_INSTALL to this folder -# -# This is only downloaded when a build activates scope gcc_aarch64_linux -# -# Copyright (c) Microsoft Corporation. -# SPDX-License-Identifier: BSD-2-Clause-Patent -## -{ - "scope": "gcc_aarch64_linux", - "type": "web", - "name": "gcc_aarch64_linux", - "source": "https://developer.arm.com/-/media/Files/downloads/gnu/11.2-20= 22.02/binrel/gcc-arm-11.2-2022.02-x86_64-aarch64-none-linux-gnu.tar.xz", - "version": "11.2-2022.02", - "sha256": "52dbac3eb71dbe0916f60a8c5ab9b7dc9b66b3ce513047baa09fae56234e5= 3f3", - "compression_type": "tar", - "internal_path": "/gcc-arm-11.2-2022.02-x86_64-aarch64-none-linux-gnu/", - "flags": ["set_shell_var", ], - "var_name": "GCC5_AARCH64_INSTALL" -} diff --git a/BaseTools/Bin/gcc_arm_linux_ext_dep.yaml b/BaseTools/Bin/gcc_a= rm_linux_ext_dep.yaml deleted file mode 100644 index 151cbfa4b532..000000000000 --- a/BaseTools/Bin/gcc_arm_linux_ext_dep.yaml +++ /dev/null @@ -1,21 +0,0 @@ -## @file -# Download GCC ARM compiler from Arm's release site -# Set shell variable GCC5_ARM_INSTALL to this folder -# -# This is only downloaded when a build activates scope gcc_arm_linux -# -# Copyright (c) Microsoft Corporation. -# SPDX-License-Identifier: BSD-2-Clause-Patent -## -{ - "scope": "gcc_arm_linux", - "type": "web", - "name": "gcc_arm_linux", - "source": "https://developer.arm.com/-/media/Files/downloads/gnu/11.2-20= 22.02/binrel/gcc-arm-11.2-2022.02-x86_64-arm-none-linux-gnueabihf.tar.xz", - "version": "11.2-2022.02", - "sha256": "c254f7199261fe76c32ef42187502839bda7efad0a66646cf739d074eff45= fad", - "compression_type": "tar", - "internal_path": "/gcc-arm-11.2-2022.02-x86_64-arm-none-linux-gnueabihf/= ", - "flags": ["set_shell_var", ], - "var_name": "GCC5_ARM_INSTALL" -} diff --git a/BaseTools/Bin/gcc_riscv64_unknown_ext_dep.yaml b/BaseTools/Bin= /gcc_riscv64_unknown_ext_dep.yaml deleted file mode 100644 index 8abbcd7ba040..000000000000 --- a/BaseTools/Bin/gcc_riscv64_unknown_ext_dep.yaml +++ /dev/null @@ -1,22 +0,0 @@ -## @file -# Download GCC RISCV64 compiler from RISC-V Organization release site -# Set shell variable GCC5_RISCV64_INSTALL to this folder -# -# This is only downloaded when a build activates scope gcc_riscv64_unknown -# -# Copyright (c) Microsoft Corporation. -# Copyright (c) 2020, Hewlett Packard Enterprise Development LP. All right= s reserved.
-# SPDX-License-Identifier: BSD-2-Clause-Patent -## -{ - "scope": "gcc_riscv64_unknown", - "type": "web", - "name": "gcc_riscv64_unknown", - "source": "https://raw.githubusercontent.com/riscv/riscv-uefi-edk2-docs/= master/gcc-riscv-edk2-ci-toolchain/gcc-riscv-9.2.0-2020.04-x86_64_riscv64-u= nknown-gnu.tar.xz", - "version": "9.2.0", - "compression_type": "tar", - "sha256": "28373643b69f0ce008273c3dc63f172aa1121952f1b9ae94d7485ac94af7f= 344", - "internal_path": "/gcc-riscv-9.2.0-2020.04-x86_64_riscv64-unknown-gnu", - "flags": ["set_shell_var", ], - "var_name": "GCC5_RISCV64_INSTALL" -} --=20 2.35.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#89062): https://edk2.groups.io/g/devel/message/89062 Mute This Topic: https://groups.io/mt/90557215/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-