Hi Grant, I will remove this one line while upstreaming. No need to submit another patch.
With Warm Regards, Edhay > -----Original Message----- > From: Grant Likely <grant.lik...@arm.com> > Sent: 19 February 2021 23:32 > To: G Edhaya Chandran <edhaya.chand...@arm.com>; devel@edk2.groups.io; > Barton Gao <gao...@byosoft.com.cn> > Cc: nd <n...@arm.com>; Samer El-Haj-Mahmoud <Samer.El-Haj- > mahm...@arm.com> > Subject: Re: [edk2-sct PATCH 3/3] edk2-test: Helper script to build SCT+Shell > in > a bootable format > > > > On 15/02/2021 12:30, G Edhaya Chandran wrote: > > Hi Grant, > > > > A minor comment: > > > > +getconf _NPROCESSORS_ONLN > > This print may not be needed. > > No, not needed. I seem to have left in a debug bit. Do you need me to respin > the series, or can I just submit a followup patch to clean it up? > > g. > > > > > > > With Warm Regards, > > Edhay > > > > > >> -----Original Message----- > >> From: Grant Likely <grant.lik...@arm.com> > >> Sent: 11 February 2021 23:16 > >> To: devel@edk2.groups.io; G Edhaya Chandran > >> <edhaya.chand...@arm.com>; Barton Gao <gao...@byosoft.com.cn> > >> Cc: nd <n...@arm.com>; Samer El-Haj-Mahmoud <Samer.El-Haj- > >> mahm...@arm.com>; Grant Likely <grant.lik...@arm.com> > >> Subject: [edk2-sct PATCH 3/3] edk2-test: Helper script to build > >> SCT+Shell in a bootable format > >> > >> The buildzip.sh script builds the SCT and the EFI Shell, and then > >> zips them up in a file structure that can be booted when unzipped to > >> a USB drive or other block storage. > >> > >> Signed-off-by: Grant Likely <grant.lik...@arm.com> > >> --- > >> uefi-sct/SctPkg/buildzip.sh | 67 > +++++++++++++++++++++++++++++++++++++ > >> 1 file changed, 67 insertions(+) > >> create mode 100755 uefi-sct/SctPkg/buildzip.sh > >> > >> diff --git a/uefi-sct/SctPkg/buildzip.sh > >> b/uefi-sct/SctPkg/buildzip.sh new file mode 100755 index > >> 00000000..c5bf20df > >> --- /dev/null > >> +++ b/uefi-sct/SctPkg/buildzip.sh > >> @@ -0,0 +1,67 @@ > >> +#!/bin/bash > >> +# > >> +# EDK2 SCT build script for SCT+Shell in a zip file # # Copyright > >> +(c) 2021, ARM Ltd. All rights reserved. > >> +# > >> +# This program and the accompanying materials # are licensed and > >> +made available under the terms and conditions of the BSD License # > >> +which accompanies this distribution. The full text of the license > >> +may be found at # http://opensource.org/licenses/bsd-license.php > >> +# > >> +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" > >> +BASIS, # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, > >> EITHER EXPRESS OR IMPLIED. > >> + > >> +set -e > >> + > >> +TARGET_ARCH=$1 > >> + > >> +if [ X"${TARGET_ARCH}" == X"" ] > >> +then > >> + echo "Usage: $0 <ARM|AARCH64>" > >> + exit > >> +fi > >> + > >> +case $TARGET_ARCH in > >> + AARCH64) > >> + BOOT_IMAGE_NAME=BOOTAA64.efi;; > >> + *) > >> + BOOT_IMAGE_NAME=BOOT${TARGET_ARCH}.efi;; > >> +esac > >> + > >> +# clear all positional parameters > >> +set -- > >> + > >> +source ./edk2/edksetup.sh > >> + > >> +getconf _NPROCESSORS_ONLN > >> +NUM_CPUS=$((`getconf _NPROCESSORS_ONLN` + 2)) > >> + > >> +make -j"$NUM_CPUS" -C edk2/BaseTools/ > >> + > >> +# Build the SCT and the shell > >> +DSC_EXTRA=ShellPkg/ShellPkg.dsc ./SctPkg/build.sh ${TARGET_ARCH} GCC > >> RELEASE -j"$NUM_CPUS" > >> + > >> +# Assemble all the files that need to be in the zip file mkdir -p > >> +${TARGET_ARCH}_SCT/EFI/BOOT cp > >> +Build/Shell/RELEASE_GCC5/${TARGET_ARCH}/Shell_EA4BB293-2D7F-4456- > >> A681-1 > >> +F22F42CD0BC.efi > ${TARGET_ARCH}_SCT/EFI/BOOT/${BOOT_IMAGE_NAME} > >> + > >> +mkdir -p ${TARGET_ARCH}_SCT/SCT > >> +cp -r > >> > +Build/UefiSct/RELEASE_GCC5/SctPackage${TARGET_ARCH}/${TARGET_ARCH} > >> /* > >> +${TARGET_ARCH}_SCT/SCT/ cp > >> +Build/UefiSct/RELEASE_GCC5/SctPackage${TARGET_ARCH}/SctStartup.nsh > >> +${TARGET_ARCH}_SCT/Startup.nsh > >> + > >> +# Copy the SCT Parser tool into the repo cp sct_parser/* > >> +${TARGET_ARCH}_SCT/SCT/Sequence/ > >> + > >> +# Put some version information into the ESP directory cat > > >> +./${TARGET_ARCH}_SCT/versions.txt << EOF EDK2_VER=`git -C ./edk2 > >> +describe` EDK2_TEST_VER=`git -C ./edk2-test describe` > >> +BUILD_DATE="`date`" > >> +EOF > >> + > >> +# Zip up the test folder > >> +cd ${TARGET_ARCH}_SCT > >> +zip -r ../edk2-test-${TARGET_ARCH,,}.zip * cd .. > >> + > >> -- > >> 2.20.1 > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#71853): https://edk2.groups.io/g/devel/message/71853 Mute This Topic: https://groups.io/mt/80563677/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-