From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.groups.io with SMTP id smtpd.web12.3037.1605307567630262364 for ; Fri, 13 Nov 2020 14:46:07 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PJHE2J9p; spf=pass (domain: redhat.com, ip: 216.205.24.124, mailfrom: lersek@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605307566; 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=yyS/+lYbjqc+A7a+VysKkgymg527a4PbLrJZS1zMMqc=; b=PJHE2J9pLpvonefcd4VrHMsVO1xvnnZ0Djg85VRNst3BeeiMZm5TOKMcZg+i8suh4Pfx33 6Y1+ePBiNgCFy86OPG1nQJ10Cak8v0oikcT44L6kxzbr26JYZgMvj0gdtom5/5svXV6hSy aNcsmE6d1SwYdnvd7EKsas2dV5I9G2U= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-31-lZ2YxUxWPLG-HM89cNB5Eg-1; Fri, 13 Nov 2020 17:46:01 -0500 X-MC-Unique: lZ2YxUxWPLG-HM89cNB5Eg-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CC47B57240; Fri, 13 Nov 2020 22:45:59 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-112-113.ams2.redhat.com [10.36.112.113]) by smtp.corp.redhat.com (Postfix) with ESMTP id E628662665; Fri, 13 Nov 2020 22:45:58 +0000 (UTC) Subject: Re: [edk2-devel] [PATCH] Add support for building extra packages To: devel@edk2.groups.io, grant.likely@arm.com Cc: nd@arm.com References: <20201112110230.29195-1-grant.likely@arm.com> From: "Laszlo Ersek" Message-ID: Date: Fri, 13 Nov 2020 23:45:57 +0100 MIME-Version: 1.0 In-Reply-To: <20201112110230.29195-1-grant.likely@arm.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=lersek@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit On 11/12/20 12:02, Grant Likely wrote: > 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 > > # > -# 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=$? > -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=$? > -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=$? > + if test $status -ne 0 > + then > + echo Could not build package $DSC > + exit -1 > + fi > +done > > # > # If the argument is clean, then don't have to generate Sct binary. > meta: Grant, if the patch is not for the main "edk2" project / repository, please place the name of the project / repository in the bracketed subject prefix, e.g., [edk2-platforms PATCH]. CC'ing maintainers / reviewers is also highly recommended. Thanks! Laszlo