public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [edk2-sct PATCH] buildzip: Add CapsuleApp.efi to the SCT zip file
@ 2021-04-27 16:15 Grant Likely
  2021-04-27 16:20 ` [edk2-devel] " Samer El-Haj-Mahmoud
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Grant Likely @ 2021-04-27 16:15 UTC (permalink / raw)
  To: devel; +Cc: nd, Grant Likely, G Edhaya Chandran, Barton Gao

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


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [edk2-devel] [edk2-sct PATCH] buildzip: Add CapsuleApp.efi to the SCT zip file
  2021-04-27 16:15 [edk2-sct PATCH] buildzip: Add CapsuleApp.efi to the SCT zip file Grant Likely
@ 2021-04-27 16:20 ` Samer El-Haj-Mahmoud
  2021-04-30 16:06 ` G Edhaya Chandran
       [not found] ` <167AAE679A8A959E.18255@groups.io>
  2 siblings, 0 replies; 4+ messages in thread
From: Samer El-Haj-Mahmoud @ 2021-04-27 16:20 UTC (permalink / raw)
  To: devel@edk2.groups.io, Grant Likely
  Cc: nd, G Edhaya Chandran, Barton Gao, Samer El-Haj-Mahmoud

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
> 
> 
> 
> 
> 


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [edk2-sct PATCH] buildzip: Add CapsuleApp.efi to the SCT zip file
  2021-04-27 16:15 [edk2-sct PATCH] buildzip: Add CapsuleApp.efi to the SCT zip file Grant Likely
  2021-04-27 16:20 ` [edk2-devel] " Samer El-Haj-Mahmoud
@ 2021-04-30 16:06 ` G Edhaya Chandran
       [not found] ` <167AAE679A8A959E.18255@groups.io>
  2 siblings, 0 replies; 4+ messages in thread
From: G Edhaya Chandran @ 2021-04-30 16:06 UTC (permalink / raw)
  To: Grant Likely, devel@edk2.groups.io; +Cc: nd, Barton Gao

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


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [edk2-devel] [edk2-sct PATCH] buildzip: Add CapsuleApp.efi to the SCT zip file
       [not found] ` <167AAE679A8A959E.18255@groups.io>
@ 2021-05-08 15:36   ` G Edhaya Chandran
  0 siblings, 0 replies; 4+ messages in thread
From: G Edhaya Chandran @ 2021-05-08 15:36 UTC (permalink / raw)
  To: devel@edk2.groups.io, G Edhaya Chandran, Grant Likely; +Cc: nd, Barton Gao

Upstreamed by commit id: https://github.com/tianocore/edk2-test/commit/9b6d2b1d15af785d87ecd2c4d29906a86957d545



> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of G Edhaya
> Chandran via groups.io
> Sent: 30 April 2021 21:36
> To: Grant Likely <Grant.Likely@arm.com>; devel@edk2.groups.io
> Cc: nd <nd@arm.com>; Barton Gao <gaojie@byosoft.com.cn>
> Subject: Re: [edk2-devel] [edk2-sct PATCH] buildzip: Add CapsuleApp.efi to the
> SCT zip file
> 
> 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
> 
> 
> 
> 
> 


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-05-08 15:37 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-27 16:15 [edk2-sct PATCH] buildzip: Add CapsuleApp.efi to the SCT zip file Grant Likely
2021-04-27 16:20 ` [edk2-devel] " Samer El-Haj-Mahmoud
2021-04-30 16:06 ` G Edhaya Chandran
     [not found] ` <167AAE679A8A959E.18255@groups.io>
2021-05-08 15:36   ` [edk2-devel] " G Edhaya Chandran

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox