[edk2-devel] [edk2-sct PATCH] buildzip: Add CapsuleApp.efi to the SCT zip file

Grant Likely posted 1 patch 2 weeks, 6 days ago
Failed in applying to current master (apply log)
uefi-sct/SctPkg/buildzip.sh | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)

[edk2-devel] [edk2-sct PATCH] buildzip: Add CapsuleApp.efi to the SCT zip file

Posted by Grant Likely 2 weeks, 6 days ago
CapsuleApp.efi is necessary for testing capsule updates of the firmware.
Add it into the default build.

Cc: G Edhaya Chandran <edhaya.chandran@arm.com>
Cc: Barton Gao <gaojie@byosoft.com.cn>
Signed-off-by: Grant Likely <grant.likely@arm.com>
---
 uefi-sct/SctPkg/buildzip.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/uefi-sct/SctPkg/buildzip.sh b/uefi-sct/SctPkg/buildzip.sh
index 6dfb5aec..cdbe80d7 100755
--- a/uefi-sct/SctPkg/buildzip.sh
+++ b/uefi-sct/SctPkg/buildzip.sh
@@ -39,8 +39,8 @@ 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"
+# Build the SCT, CapsuleApp.efi, and the shell
+DSC_EXTRA="ShellPkg/ShellPkg.dsc MdeModulePkg/MdeModulePkg.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
@@ -50,6 +50,9 @@ 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
 
+mkdir -p ${TARGET_ARCH}_SCT/Mde
+cp Build/MdeModule/RELEASE_GCC5/${TARGET_ARCH}/CapsuleApp.efi ${TARGET_ARCH}_SCT/Mde
+
 # Copy the SCT Parser tool into the repo
 cp sct_parser/* ${TARGET_ARCH}_SCT/SCT/Sequence/
 
-- 
2.20.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#74488): https://edk2.groups.io/g/devel/message/74488
Mute This Topic: https://groups.io/mt/82407764/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-


Re: [edk2-devel] [edk2-sct PATCH] buildzip: Add CapsuleApp.efi to the SCT zip file

Posted by G Edhaya Chandran 2 weeks, 3 days ago
Reviewed-by: G Edhaya Chandran<edhaya.chandran@arm.com>

> -----Original Message-----
> From: Grant Likely <Grant.Likely@arm.com>
> Sent: 27 April 2021 21:46
> To: devel@edk2.groups.io
> Cc: nd <nd@arm.com>; Grant Likely <Grant.Likely@arm.com>; G Edhaya
> Chandran <Edhaya.Chandran@arm.com>; Barton Gao <gaojie@byosoft.com.cn>
> Subject: [edk2-sct PATCH] buildzip: Add CapsuleApp.efi to the SCT zip file
> 
> CapsuleApp.efi is necessary for testing capsule updates of the firmware.
> Add it into the default build.
> 
> Cc: G Edhaya Chandran <edhaya.chandran@arm.com>
> Cc: Barton Gao <gaojie@byosoft.com.cn>
> Signed-off-by: Grant Likely <grant.likely@arm.com>
> ---
>  uefi-sct/SctPkg/buildzip.sh | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/uefi-sct/SctPkg/buildzip.sh b/uefi-sct/SctPkg/buildzip.sh index
> 6dfb5aec..cdbe80d7 100755
> --- a/uefi-sct/SctPkg/buildzip.sh
> +++ b/uefi-sct/SctPkg/buildzip.sh
> @@ -39,8 +39,8 @@ 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"
> +# Build the SCT, CapsuleApp.efi, and the shell
> +DSC_EXTRA="ShellPkg/ShellPkg.dsc
> MdeModulePkg/MdeModulePkg.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 @@ -50,6 +50,9 @@ 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
> 
> +mkdir -p ${TARGET_ARCH}_SCT/Mde
> +cp Build/MdeModule/RELEASE_GCC5/${TARGET_ARCH}/CapsuleApp.efi
> +${TARGET_ARCH}_SCT/Mde
> +
>  # Copy the SCT Parser tool into the repo  cp sct_parser/*
> ${TARGET_ARCH}_SCT/SCT/Sequence/
> 
> --
> 2.20.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#74659): https://edk2.groups.io/g/devel/message/74659
Mute This Topic: https://groups.io/mt/82407764/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-


Re: [edk2-devel] [edk2-sct PATCH] buildzip: Add CapsuleApp.efi to the SCT zip file

Posted by Samer El-Haj-Mahmoud 2 weeks, 6 days ago
Reviewed-by: Samer El-Haj-Mahmoud <Samer.El-Haj-Mahmoud@arm.com>

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Grant
> Likely via groups.io
> Sent: Tuesday, April 27, 2021 12:16 PM
> To: devel@edk2.groups.io
> Cc: nd <nd@arm.com>; Grant Likely <Grant.Likely@arm.com>; G Edhaya
> Chandran <Edhaya.Chandran@arm.com>; Barton Gao
> <gaojie@byosoft.com.cn>
> Subject: [edk2-devel] [edk2-sct PATCH] buildzip: Add CapsuleApp.efi to the
> SCT zip file
> 
> CapsuleApp.efi is necessary for testing capsule updates of the firmware.
> Add it into the default build.
> 
> Cc: G Edhaya Chandran <edhaya.chandran@arm.com>
> Cc: Barton Gao <gaojie@byosoft.com.cn>
> Signed-off-by: Grant Likely <grant.likely@arm.com>
> ---
>  uefi-sct/SctPkg/buildzip.sh | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/uefi-sct/SctPkg/buildzip.sh b/uefi-sct/SctPkg/buildzip.sh index
> 6dfb5aec..cdbe80d7 100755
> --- a/uefi-sct/SctPkg/buildzip.sh
> +++ b/uefi-sct/SctPkg/buildzip.sh
> @@ -39,8 +39,8 @@ 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"
> +# Build the SCT, CapsuleApp.efi, and the shell
> +DSC_EXTRA="ShellPkg/ShellPkg.dsc MdeModulePkg/MdeModulePkg.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 @@ -50,6 +50,9 @@ 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
> 
> +mkdir -p ${TARGET_ARCH}_SCT/Mde
> +cp Build/MdeModule/RELEASE_GCC5/${TARGET_ARCH}/CapsuleApp.efi
> +${TARGET_ARCH}_SCT/Mde
> +
>  # Copy the SCT Parser tool into the repo  cp sct_parser/*
> ${TARGET_ARCH}_SCT/SCT/Sequence/
> 
> --
> 2.20.1
> 
> 
> 
> 
> 



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#74489): https://edk2.groups.io/g/devel/message/74489
Mute This Topic: https://groups.io/mt/82407764/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-