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.79]) by mx.groups.io with SMTP id smtpd.web08.2600.1605179012767718330 for ; Thu, 12 Nov 2020 03:03:33 -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=R/E0HMC+; spf=pass (domain: arm.com, ip: 40.107.7.79, 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=ZNCiCHmk8fe9m/X0gxmS5qCXBuK5n+llSQgkBzlTijQ=; b=R/E0HMC+mIYOUPSCs4PeKaUdEXj6HP9cjEje3kFldy3gM9hW1MvdSbAjoGx24CD0XDW+dft0rSvyzPjchh3Zk3d3wbisQRhak75WDcib4/6xwGUVp6P0SCTANxyS39td9TQNHIEGlUZOi7BLChKQRIBstcGIFTIgxdrJWYl0Xyk= Received: from AM6PR0502CA0057.eurprd05.prod.outlook.com (2603:10a6:20b:56::34) by PA4PR08MB5920.eurprd08.prod.outlook.com (2603:10a6:102:ea::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.22; Thu, 12 Nov 2020 11:03:30 +0000 Received: from AM5EUR03FT059.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:56:cafe::29) by AM6PR0502CA0057.outlook.office365.com (2603:10a6:20b:56::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.25 via Frontend Transport; Thu, 12 Nov 2020 11:03:30 +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 AM5EUR03FT059.mail.protection.outlook.com (10.152.17.193) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.22 via Frontend Transport; Thu, 12 Nov 2020 11:03:30 +0000 Received: ("Tessian outbound 39167997cde8:v71"); Thu, 12 Nov 2020 11:03:30 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: bf4afa4ecfc4c0f7 X-CR-MTA-TID: 64aa7808 Received: from 45c8f91efbf9.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id ED265284-E641-4099-BC57-294EEE8C973C.1; Thu, 12 Nov 2020 11:03:19 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 45c8f91efbf9.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Thu, 12 Nov 2020 11:03:19 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QGYj7ad/xGcbNRCNNUxF+lG2mDGLZzmPWjDx3yJL/E+cFAMNUneY3PBrUI+X8wDnSsOmcOEA5koFOn57j7edxRDrMe51eGN+lfhFPTjaQ+Fz/FTcFrhrFrixqcIGJx/8UjAbBfcSWtQsiwmyBxjoCZivgMgmTljg9GMneMGw5zelrGf9AQH5pHXRx1QTKMNkVadeM+uNH5Vxpn/NsE24mS8a1X50hCFMOjq2eC8oBKtGh5c4JrgldpFYn+gK6/319P+1DzFgOqBxGz6DeiHkZcSdXEcx+xG80j/Rus8CsR9zRHJHQc+oGkDtV3syqdJ8KWEkKH+x6KsRkVDpcyY7cg== 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=ZNCiCHmk8fe9m/X0gxmS5qCXBuK5n+llSQgkBzlTijQ=; b=ZPnI2+nuWdn/OSguqrz76tNYXqPt5TLuCnp/mbbAv5vAoqk1eUeJ5Pt6ueZUsg8QTzchG/OV+7peu9w1QSnwLMg6ysmLsswMAmrDsoVtcSSG+NOy+YS7jGqCm2EWSY/RDNy9V52Le8Onz9LTe12ri4cANA3cTQcj+qipKnqGi+eydpBi6dcZvjeZ6QyS/0re+aZKguRLXVcOfyNuoI6s89y9Y54cknWu9FJiMoBYep/T6GQMVJG64kf5FF5iwos7nV3tVj4Pp61gtvoJX/1G84Qv03+TWTdww9QSN/acnOFZE+WEffCjp689EVldDwrjS3xXClTlukKrLCDn7BX/jA== 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=ZNCiCHmk8fe9m/X0gxmS5qCXBuK5n+llSQgkBzlTijQ=; b=R/E0HMC+mIYOUPSCs4PeKaUdEXj6HP9cjEje3kFldy3gM9hW1MvdSbAjoGx24CD0XDW+dft0rSvyzPjchh3Zk3d3wbisQRhak75WDcib4/6xwGUVp6P0SCTANxyS39td9TQNHIEGlUZOi7BLChKQRIBstcGIFTIgxdrJWYl0Xyk= 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 DB6PR0802MB2390.eurprd08.prod.outlook.com (2603:10a6:4:9f::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.21; Thu, 12 Nov 2020 11:03:18 +0000 Received: from DB8PR08MB4010.eurprd08.prod.outlook.com ([fe80::98af:2036:2908:bb3a]) by DB8PR08MB4010.eurprd08.prod.outlook.com ([fe80::98af:2036:2908:bb3a%5]) with mapi id 15.20.3541.021; Thu, 12 Nov 2020 11:03:18 +0000 From: "Grant Likely" To: devel@edk2.groups.io CC: nd@arm.com, Grant Likely Subject: [PATCH] Add support for building extra packages Date: Thu, 12 Nov 2020 11:02:30 +0000 Message-ID: <20201112110230.29195-1-grant.likely@arm.com> X-Mailer: git-send-email 2.20.1 X-Originating-IP: [188.28.144.143] X-ClientProxiedBy: LO2P265CA0157.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:9::25) 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 (188.28.144.143) by LO2P265CA0157.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:9::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.21 via Frontend Transport; Thu, 12 Nov 2020 11:03:17 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 59bf4d6a-0739-4c06-6c70-08d886fa96b5 X-MS-TrafficTypeDiagnostic: DB6PR0802MB2390:|PA4PR08MB5920: 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: HaZ4sQBrbjNDdXKHG9IrQbIQJuK/iF91rcZ1DAlQE5jdcpFWVs4mCyk74a6ckAJcOuvNJw2sWb21EHOlIiPkL0Y1utLy9W+zJQql3HwtrDdahE1GC/2f7bUlp3wJwYT0ntyruD5CRSiQnigPd+vhXFAL+VHIwn81ekD6UN6akeuAuo7XTZ2Po3h9YgJ9HFLSyKoJyyVI+tJ5e7hUIrNeU0NaM989FH6TmikyOLjwG+zyMo59SQBLvAInA2iei1oXwvuPzoxqKIDBzg1xVb2ZGVZp3PZWK1+IexVOr17vj8UTLNNjKc5WZC6PNlk9fPy4 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)(136003)(396003)(346002)(366004)(376002)(39860400002)(66556008)(2616005)(956004)(36756003)(16526019)(186003)(52116002)(55236004)(86362001)(6506007)(1076003)(6916009)(26005)(6512007)(8676002)(478600001)(8936002)(66946007)(44832011)(4326008)(5660300002)(2906002)(6486002)(83380400001)(316002)(6666004)(66476007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 4DMJmNGLqVHKqRpw7vc4sbHOB6LjDg9JE7qIrQ1e4LTHNBP9JsCJ1U0gFFSbKBJgsKfpoZR+bbgrEJHGvN3FqkQwWytOUcTKqgxFIK8DrieXx6pSky5TsOiSeiHA35B26eN5eRhVfnij01Q0rBieAzc5gZ0CvrLaW89yyZv38nlNkR79PfmuX6T9+/qp3nQOKKbPX7kZnW5v+z9Q2zrfG5bjklm6VtuEj4ma2YdfYcYELPz5bkEvzocPg1Pg6PEQzW9Dc5u6JnnCt1tuaN+e2l7H+wH3YxAoVdSyQsJSOaCzQPlFOfrz+QkFtmmusfMV4VHafmeIM8UhNjZlIzN1zng/TnvTNCRtBORvrpirf2ZNgYaSWF1NcLPgUrM+5i2mbRcviO7E5SaoDsk3Ru7iCSOi0tDS7pIkJ4TQZ6nMWBQC7Iah9fpINwvbXocUnIM13ox2lm10HfnYDWC6qSXcgZaFJcavCSYLC5mR41qIU+UoEPxQcwNuQGASpYEbSvA7jh+7ooOzRv3k3WrzUaw78YncOVBZxtgqiJ74VzUSk5YwVPk5syN56o1EFR5qgu+eJ8qtsjKCuJ4hd3NHuSIMdHTpSpfDgKDdI4rbfy7WaLhHJ4IDv8AwRTwH6vRUVA7bx46MqP3dLRUGbA6XMHIbug== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0802MB2390 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: AM5EUR03FT059.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 595f4959-d5bd-4a39-d0e6-08d886fa8f3f X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4On0H18Q1F69t1SlmrnZgksBwhzNy5m4w/lyRDgFFETCiPW3xl23hY2UXHf6d42Q34W9969t+zuEN3qGManQ5MBxNkDp/l1EXMcw4BsDtK1b7pZsFgxKY3M5k0ZxKmei5bkIn3ejeu2iZ67HEn8nGF3njg7rc1JPiwCRiik2ESj7MrHurW/lf+h4xwBvwPKHX0GXB3+JVnxsea9affsziK/bmxM9p1izji7XrDKR5VWC+AlBwKWqsInvr1BerhsAubxr30WQuvkDMge1Hy2JkvgBrfMKYU1hOgIbKQWU0F6Bk7WszFo4eu5YNmJYrKbn7Y7tmR3rSNdC4AwnywPwFRLe1YtwPeiw+Axr6bgqj+5uS33ET2F9kKYGnjzkEdiPzQ/USJGhwHlFvnKxcMUCRg== 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)(396003)(39860400002)(136003)(376002)(346002)(46966005)(16526019)(70206006)(5660300002)(83380400001)(70586007)(336012)(6512007)(6916009)(6486002)(44832011)(8676002)(1076003)(4326008)(82310400003)(478600001)(956004)(186003)(86362001)(2616005)(8936002)(36906005)(6666004)(26005)(356005)(2906002)(36756003)(55236004)(6506007)(316002)(47076004)(81166007)(82740400003);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Nov 2020 11:03:30.0773 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 59bf4d6a-0739-4c06-6c70-08d886fa96b5 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: AM5EUR03FT059.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR08MB5920 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. Signed-off-by: Grant Likely --- 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 cad17ccd..e7c18fef 100755 --- a/uefi-sct/SctPkg/build.sh +++ b/uefi-sct/SctPkg/build.sh @@ -250,28 +250,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