From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (EUR04-HE1-obe.outbound.protection.outlook.com [40.107.7.78]) by mx.groups.io with SMTP id smtpd.web10.66.1613065653216953222 for ; Thu, 11 Feb 2021 09:47:34 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=Ar5z+mWH; spf=pass (domain: arm.com, ip: 40.107.7.78, mailfrom: grant.likely@arm.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Igt8UrhB8NTSGdwu/d3nG5UJNPTkkbT//dsm3A/x7JE=; b=Ar5z+mWH1z2CXZJOytBAPWbZBEA4BRCRPX+fhGFuBFPuX1X9M/nqoLN86mueeR67eZ3vja3kpSCvJNQmSYZoXQZfF6zskYxfItpnYHLH2Dq3C9gV2jvkbCa6YXAWHHvLN1NWfq/8ZuuZGDHdn9TuKxwNr8QHGPjWLWX2EpRn8ks= Received: from DB8PR06CA0010.eurprd06.prod.outlook.com (2603:10a6:10:100::23) by HE1PR0802MB2410.eurprd08.prod.outlook.com (2603:10a6:3:dd::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.27; Thu, 11 Feb 2021 17:47:17 +0000 Received: from DB5EUR03FT055.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:100:cafe::2e) by DB8PR06CA0010.outlook.office365.com (2603:10a6:10:100::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.25 via Frontend Transport; Thu, 11 Feb 2021 17:47:17 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; edk2.groups.io; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;edk2.groups.io; dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DB5EUR03FT055.mail.protection.outlook.com (10.152.21.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.25 via Frontend Transport; Thu, 11 Feb 2021 17:47:17 +0000 Received: ("Tessian outbound 28c96a6c9d2e:v71"); Thu, 11 Feb 2021 17:47:17 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 177201426eced123 X-CR-MTA-TID: 64aa7808 Received: from 93e1895ef12f.2 by 64aa7808-outbound-1.mta.getcheckrecipient.com id C7809625-EE66-40AC-A30D-97BFD47B3CDB.1; Thu, 11 Feb 2021 17:47:11 +0000 Received: from EUR04-HE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 93e1895ef12f.2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Thu, 11 Feb 2021 17:47:11 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gWMvwrbOClQkBhthSv1rFt18qui69JtkHzGVfZejOT1TOWahkhELMV1xkOK+Mp3+dLcDD7NIAzBbE3382NV98kk5WeiKYLmGbZ1xaZ7miU7/uy4QqrUaQtp8YTZ3MfBxy4sFMyqDmNwwVFCSjeBM1d7sqQ7ClwWcUPMERj3gMvb3kWtEu/XZ4iz9zNSf0a7YNCHWBqBYAO0DLjhpIciqFFEWzPIdw6bvz3+qTDDv0g4887ZteKrrAQVwuJE/2d9hQuKGucwnH0VGFiOGU+jZzJ9xTFYajE94SKLby0/xkMbWFSj5vxwJd5DHtufd9ScWL00JeldR4Za5bUjqfBVcbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Igt8UrhB8NTSGdwu/d3nG5UJNPTkkbT//dsm3A/x7JE=; b=AGiKU67KaStu5aZgUJwUTcTcp5DyL6b9b2IsV60LoMvymRBEb3EZFuPQOh5yvdbRPyDr/FpFTdl6WpOCH5bjeDWrJ+1nab+22ZqfKuwYE1REsQrUV0gmRTp2pDZwNJXdMOIXGLOENDDxdI81UyQztzv2EasIfgrm78AuFxK00YOpQpEioc3OYP7iE6278/MILKP8RKbhq38702T6JuAuErO56Nz93zjPtuWAMrf1u0FAkbptE4LLzt8oDRKPVT7bu7vH2zM1isQIyPo2snvG/tokOdRJ9+wYPbSVpuBkL6Y+/3qJ8NRcvN6YeRuskLFq3JR3fsVBTjjoHEarkhb8Dw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Igt8UrhB8NTSGdwu/d3nG5UJNPTkkbT//dsm3A/x7JE=; b=Ar5z+mWH1z2CXZJOytBAPWbZBEA4BRCRPX+fhGFuBFPuX1X9M/nqoLN86mueeR67eZ3vja3kpSCvJNQmSYZoXQZfF6zskYxfItpnYHLH2Dq3C9gV2jvkbCa6YXAWHHvLN1NWfq/8ZuuZGDHdn9TuKxwNr8QHGPjWLWX2EpRn8ks= Authentication-Results-Original: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=arm.com; Received: from DB8PR08MB4010.eurprd08.prod.outlook.com (2603:10a6:10:ab::15) by DB6PR0801MB1944.eurprd08.prod.outlook.com (2603:10a6:4:73::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3825.20; Thu, 11 Feb 2021 17:47:09 +0000 Received: from DB8PR08MB4010.eurprd08.prod.outlook.com ([fe80::715b:de9:c268:cfd9]) by DB8PR08MB4010.eurprd08.prod.outlook.com ([fe80::715b:de9:c268:cfd9%3]) with mapi id 15.20.3825.030; Thu, 11 Feb 2021 17:47:09 +0000 From: "Grant Likely" To: devel@edk2.groups.io, G Edhaya Chandran , Barton Gao CC: nd@arm.com, Samer El-Haj-Mahmoud , Grant Likely , Samer El-Haj-Mahmoud Subject: [edk2-sct PATCH 1/3] edk2-test: Add support for building extra packages Date: Thu, 11 Feb 2021 17:46:03 +0000 Message-ID: <20210211174605.17937-1-grant.likely@arm.com> X-Mailer: git-send-email 2.20.1 X-Originating-IP: [84.69.148.82] X-ClientProxiedBy: LO2P265CA0406.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:f::34) To DB8PR08MB4010.eurprd08.prod.outlook.com (2603:10a6:10:ab::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from moist.secretlab.ca (84.69.148.82) by LO2P265CA0406.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:f::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3825.19 via Frontend Transport; Thu, 11 Feb 2021 17:47:08 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 904c2166-b792-4ca1-56f7-08d8ceb512d1 X-MS-TrafficTypeDiagnostic: DB6PR0801MB1944:|HE1PR0802MB2410: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:7691;OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: Ul6cTC8Qv9F3lxS4EjyIVXHoTx+9XvXmKwntaYetXecm4dLe+mDLCsDMCUzhKMbFB6biJP0tu1ySrkvUNlkkIrbNnYRKgnhE0ZyQWBMKAvX/nAq55O4T3qgLg8tdUkCECOJDq6fgdOUQ5/9+Tz90cEW5GQUFGcKFoQG/A2FGgX5rg1C2YRPeeHYfteFYgg8LZnyUtLu4rgk7/iHmeKaFmNfVlBYjrmdQRvQwsaQeZWmhJEjqariVzVxafdWMjBK9pE6JiIt0Co3sbkQt/431I7TwCipikPzLLxr5tzIsiM1o9iaNlddaIA1FYv6Ju89wCq5nnWOcprvjn3AHB8J6CAJbCgEHbjDbC8EUBxwVIWGg6yaNu2BwSIxveKFsx+XAouVEuIWQrn11unSWJXUZHi2DzNqQTuE/VKEBgDWxkA1G4bwXLsXXbqMQBTWBoGkAZhU0qMFkCYURKZo0fBQJf4IQykOtke7AlmU5iwU8XR2DjzDq9nRD5XzzIP2xjIj3sxFvqm04Dlf+H/Erna3noQ== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB8PR08MB4010.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(136003)(376002)(346002)(39840400004)(396003)(8676002)(36756003)(2616005)(316002)(44832011)(6486002)(6666004)(16526019)(5660300002)(52116002)(186003)(26005)(54906003)(1076003)(6506007)(478600001)(83380400001)(66556008)(6512007)(4326008)(956004)(66946007)(110136005)(2906002)(66476007)(8936002)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?Tv42Pgb3dyAD/nhvAdpaxvIghdvvyHBi2mxCY+s9R3csz2enFz7EsQ/tWexR?= =?us-ascii?Q?vh7BdVw903o9R5vFVC1qjGtH8D8VgmgW41FBTNKmbbKOLuyq/LWYfSSm6anO?= =?us-ascii?Q?4EsbB15uoYq88UdPTSxUmMKUtclvhqopdUHP4IvzZ9hUTeBPSFBWNgbzsrWK?= =?us-ascii?Q?aNisPMgquUKzjLNT3xmVutHQmOROxpKSBoPvPsIqI8B1eg8OTpMW4c/+RHpk?= =?us-ascii?Q?6dZIiH/hYOk4tQbntKoJ6vTqFsfhVqu6KIA+V0wXDGukSExzINoSGCQuujOo?= =?us-ascii?Q?vUISkSBRSF51XZdQB2KoDubGDuuWHetZ5lRNo4cTLDxXYJc1R8797kjvikDK?= =?us-ascii?Q?hfOfAyUzt0A6RgmwryiHgrJ70/2oU1ultRpgl4dDp7wUQZcGURFLc5zskT/w?= =?us-ascii?Q?MDFaKlxFleSQ2i77/Ut46ySFMGD/sENlMR2/Y2j0YN1e2Y//2tlXf22ukUzX?= =?us-ascii?Q?mI7EL3Q0yxLOfEpB+PwIvv2FED2mOYSdvtMjo/YYZPRhKsHjeNho2Uk7Gq86?= =?us-ascii?Q?v2V9EffbJ+2eRo7wYEsKvhAHxw873XCPKMolA3mu2foxSyc1wm+LMoEyO5Bp?= =?us-ascii?Q?3BnO0uVlRx+tX61HuoYCX/kL3gE1fHNjjtn/NvMgUP2HB7YeHngxLcMo4Pw5?= =?us-ascii?Q?CgukRbGFUfB5zm8DURRn4a4jwmsDniZKOBSWp/OCMm3kLSDMigg85+P/sYrr?= =?us-ascii?Q?KnqcZTWXhhhOOuFr/AVjQT8Fw9fUfKKwRG9BVO8ewRkXSmqzGPOacDcQ6ddb?= =?us-ascii?Q?yDVQIub5i4YLaL2/pEp97j39a/ak7sca74Y7sUd1Urc5SG1co0/p4C+fqQJY?= =?us-ascii?Q?97XUYTpBPch1xhjaaBLH6wSSn/edn7iukVOnO1WDG5xRnWIZJq8wTNJ/OBkN?= =?us-ascii?Q?a9cBjDJt8Q/Ad+r7Z553JDvhxBIIDQ41nNb1N2lh426Ht8yH4LWacDZk03Jk?= =?us-ascii?Q?JnNfMwkk7olNLFVM5ymDQ3lVhoj+aZh9MNyon3FPse2tiJyRTbwolb81iYr2?= =?us-ascii?Q?iSfxE1/BbyG2sh0AHbyf86t7+q/qNahdyPydAh0hjhJiqDBc4zvbrMEfav5x?= =?us-ascii?Q?UVHL76ZPo+6uRIujpLs4qc2STlJfoD2PnYlmc9YJ9vYafgq88N8Bo5M6LSh+?= =?us-ascii?Q?hIsWG2AQ472C0VRuoTe1mpBe8G9NcNoruAVN9RXgUT3eGH58+bKT/dbSMKoy?= =?us-ascii?Q?bH/F9V/JSojNlFPRSCwMfkG9iKMztWw0HtM6mKbg4czPP2EOTfy/FwFaEO5D?= =?us-ascii?Q?MjZsjqpVVp5tpLyRk0lixYYH9SrFn95YHQwOcGVbw/yLsS45pkRKOZi9h9Ke?= =?us-ascii?Q?FIQVf0bRGnzS9850/+pcoTy6?= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0801MB1944 Original-Authentication-Results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=arm.com; Return-Path: Grant.Likely@arm.com X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT055.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: f0dc3868-8194-4d68-5c96-08d8ceb50dcc X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZozKVCOWbyNVUNSGOfxsjMPkuBO097/WoCuZAZcezGafEhfVC/P4e1nTZrU1cjHQBMShto2orlhjkkHhOXJpOtq9jGEf/RTLXQyAnNQ4w4zABeSiNB6EyGhXvUW6dwpLWBuAZNNSHret0+omaNKv7wgLL8M488s8DtPD74dMgU7dgCWVNQ8vHN1E64s+f4HY7HRD5s61HO/4U6NTdXKRHbbTP/2f6/a9WNOxQS24CCCXALz6gCfFzJeNMMCXgagDpiSBnYytP6bTLiP2FFklqbXxPJI0jbcz24j4/tIDIX+cVTQsFkhFmWOgQ8CmdOpkyLGzGWUImYbYjaDrWFbUgblofosyIxRSkkAMakoTjq/SEF/EvvRpPByupR8AWtuvf8zTWIA78tMXu8utAvOpigBzytLzNwJZ6/BfIpUqUdT1XrMy4mYwWXTB7uSiD20hfT1NcIdLPRTwxa6i7o2yI+sAYlz89OIylJBc6QQWIWwbjN1c+LFMuX9CMuYc3kYf31+mqbfQpIJg7mw0TwAMeW1sboQ1ez7nyBkf7wjnXr/TUGXcyBBi4pjcaOE1/zMQnD0S+Qckd2/ZkoEvOR90bILqCtumO7J98hPn5/OBZk36SqWx9DMzkStBP6+gKzFsloHzhy+jMfn67WJudWQBu8rhAldYNLatqYxoo4+g26o= X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(4636009)(39840400004)(136003)(376002)(396003)(346002)(36840700001)(46966006)(4326008)(478600001)(16526019)(36756003)(70206006)(186003)(83380400001)(86362001)(70586007)(6506007)(26005)(6666004)(8676002)(36860700001)(356005)(2906002)(81166007)(47076005)(2616005)(956004)(82310400003)(1076003)(6512007)(44832011)(336012)(316002)(8936002)(110136005)(6486002)(54906003)(5660300002);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Feb 2021 17:47:17.2971 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 904c2166-b792-4ca1-56f7-08d8ceb512d1 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR03FT055.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0802MB2410 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain The build.sh script is very useful for setting up the build environment before calling the package build. Sometimes additional packages are needed when building the SCT. (e.g., it is useful to build ShellPkg). Refactor the build code to allow additional DSCs to be added to the build. This patch is useful when building a full SCT image that includes the EDK2 shell. Signed-off-by: Grant Likely Cc: G Edhaya Chandran Cc: Barton Gao Cc: Samer El-Haj-Mahmoud --- uefi-sct/SctPkg/build.sh | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/uefi-sct/SctPkg/build.sh b/uefi-sct/SctPkg/build.sh index 37667711..22cf9667 100755 --- a/uefi-sct/SctPkg/build.sh +++ b/uefi-sct/SctPkg/build.sh @@ -249,28 +249,20 @@ mkdir -p $DEST_DIR cp $EDK_TOOLS_PATH/Source/C/bin/GenBin $DEST_DIR/GenBin =20 # -# Build the SCT package +# Build the packages needed for the SCT +# Set $DSC_EXTRA to any extra packages needed for the build # -build -p SctPkg/UEFI/UEFI_SCT.dsc -a $SCT_TARGET_ARCH -t $TARGET_TOOLS -b = $SCT_BUILD $3 $4 $5 $6 $7 $8 $9 - -# Check if there is any error -status=3D$? -if test $status -ne 0 -then - echo Could not build the UEFI SCT package - exit -1 -fi - -build -p SctPkg/UEFI/IHV_SCT.dsc -a $SCT_TARGET_ARCH -t $TARGET_TOOLS -b $= SCT_BUILD $3 $4 $5 $6 $7 $8 $9 - -# Check if there is any error -status=3D$? -if test $status -ne 0 -then - echo Could not build the IHV SCT package - exit -1 -fi - +for DSC in SctPkg/UEFI/UEFI_SCT.dsc SctPkg/UEFI/IHV_SCT.dsc $DSC_EXTRA +do + build -p $DSC -a $SCT_TARGET_ARCH -t $TARGET_TOOLS -b $SCT_BUILD $3 $4 $5= $6 $7 $8 $9 + # Check if there is any error + status=3D$? + if test $status -ne 0 + then + echo Could not build package $DSC + exit -1 + fi +done =20 # # If the argument is clean, then don't have to generate Sct binary. --=20 2.20.1