Re: [edk2-devel] [edk2-platforms Patch V3 04/12] Vlv2TbltDevicePkg: Convert BAT/sh Capsule scripts to Python
On Mon, Jul 22, 2019 at 03:58:51PM -0700, Michael D Kinney wrote: > Convert all the BAT/sh files used to generate capsules to > OS independent Python script. > Reviewed-by: Gary Lin > Cc: Zailiang Sun > Cc: Yi Qian > Cc: Gary Lin > Signed-off-by: Michael D Kinney > Reviewed-by: Zailiang Sun > --- > .../Capsule/GenerateCapsule/GenCapsuleAll.bat | 35 -- > .../Capsule/GenerateCapsule/GenCapsuleAll.py | 397 ++ > .../Capsule/GenerateCapsule/GenCapsuleAll.sh | 33 -- > .../GenerateCapsule/GenCapsuleMinnowMax.bat | 131 -- > .../GenerateCapsule/GenCapsuleMinnowMax.sh| 59 --- > .../GenCapsuleMinnowMaxRelease.bat| 131 -- > .../GenCapsuleMinnowMaxRelease.sh | 64 --- > .../GenerateCapsule/GenCapsuleSampleColor.bat | 137 -- > .../GenerateCapsule/GenCapsuleSampleColor.sh | 70 --- > .../Feature/Capsule/GenerateCapsule/Lvfs.ddf | 14 - > .../LvfsGenCapsuleMinnowMax.bat | 139 -- > .../LvfsGenCapsuleMinnowMaxRelease.bat| 139 -- > .../LvfsGenCapsuleSampleColor.bat | 145 --- > .../GenerateCapsule/template.metainfo.xml | 27 -- > .../Vlv2TbltDevicePkg/PlatformCapsuleIA32.dsc | 2 +- > .../Vlv2TbltDevicePkg/PlatformCapsuleX64.dsc | 2 +- > 16 files changed, 399 insertions(+), 1126 deletions(-) > delete mode 100644 > Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.bat > create mode 100644 > Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.py > delete mode 100755 > Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.sh > delete mode 100644 > Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMax.bat > delete mode 100644 > Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMax.sh > delete mode 100644 > Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMaxRelease.bat > delete mode 100644 > Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMaxRelease.sh > delete mode 100644 > Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleSampleColor.bat > delete mode 100644 > Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleSampleColor.sh > delete mode 100644 > Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Lvfs.ddf > delete mode 100644 > Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/LvfsGenCapsuleMinnowMax.bat > delete mode 100644 > Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/LvfsGenCapsuleMinnowMaxRelease.bat > delete mode 100644 > Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/LvfsGenCapsuleSampleColor.bat > delete mode 100644 > Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/template.metainfo.xml > > diff --git > a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.bat > > b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.bat > deleted file mode 100644 > index 8f589565fa..00 > --- > a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.bat > +++ /dev/null > @@ -1,35 +0,0 @@ > -@REM @file > -@REM Windows batch file to generate UEFI capsules for system firmware and > -@REM firmware for sample devices > -@REM > -@REM Copyright (c) 2018, Intel Corporation. All rights reserved. > -@REM SPDX-License-Identifier: BSD-2-Clause-Patent > -@REM > - > -@echo off > -setlocal > -cd /d %~dp0 > - > -rmdir /s /q %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules > -mkdir %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules > -mkdir %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\SampleDevelopment > -mkdir %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\NewCert > -mkdir %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\TestCert > -copy %WORKSPACE%\Build\Vlv2TbltDevicePkg\DEBUG_VS2015x86\X64\CapsuleApp.efi > %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\SampleDevelopment\CapsuleApp.efi > -copy > %WORKSPACE%\Build\Vlv2TbltDevicePkg\RELEASE_VS2015x86\X64\CapsuleApp.efi > %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\SampleDevelopment\CapsuleAppRelease.efi > -copy %WORKSPACE%\Build\Vlv2TbltDevicePkg\DEBUG_VS2015x86\X64\CapsuleApp.efi > %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\NewCert\CapsuleApp.efi > -copy > %WORKSPACE%\Build\Vlv2TbltDevicePkg\RELEASE_VS2015x86\X64\CapsuleApp.efi > %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\NewCert\CapsuleAppRelease.efi > -copy %WORKSPACE%\Build\Vlv2TbltDevicePkg\DEBUG_VS2015x86\X64\CapsuleApp.efi > %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\TestCert\CapsuleApp.efi > -copy > %WORKSPACE%\Build\Vlv2TbltDevicePkg\RELEASE_VS2015x86\X64\CapsuleApp.efi > %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\TestCert\CapsuleAppRelease.efi > - > -call GenCapsuleMinnowMax.bat > -call GenCapsuleMinnowMaxRelease.bat > -call
Re: [edk2-devel] [edk2-platforms Patch V3 04/12] Vlv2TbltDevicePkg: Convert BAT/sh Capsule scripts to Python
Reviewed-by: Zailiang Sun > -Original Message- > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of > Michael D Kinney > Sent: Tuesday, July 23, 2019 6:59 AM > To: devel@edk2.groups.io > Cc: Sun, Zailiang ; Qian, Yi ; > Gary Lin > Subject: [edk2-devel] [edk2-platforms Patch V3 04/12] Vlv2TbltDevicePkg: > Convert BAT/sh Capsule scripts to Python > > Convert all the BAT/sh files used to generate capsules to > OS independent Python script. > > Cc: Zailiang Sun > Cc: Yi Qian > Cc: Gary Lin > Signed-off-by: Michael D Kinney > Reviewed-by: Zailiang Sun > --- > .../Capsule/GenerateCapsule/GenCapsuleAll.bat | 35 -- > .../Capsule/GenerateCapsule/GenCapsuleAll.py | 397 > ++ > .../Capsule/GenerateCapsule/GenCapsuleAll.sh | 33 -- > .../GenerateCapsule/GenCapsuleMinnowMax.bat | 131 -- > .../GenerateCapsule/GenCapsuleMinnowMax.sh| 59 --- > .../GenCapsuleMinnowMaxRelease.bat| 131 -- > .../GenCapsuleMinnowMaxRelease.sh | 64 --- > .../GenerateCapsule/GenCapsuleSampleColor.bat | 137 -- > .../GenerateCapsule/GenCapsuleSampleColor.sh | 70 --- > .../Feature/Capsule/GenerateCapsule/Lvfs.ddf | 14 - > .../LvfsGenCapsuleMinnowMax.bat | 139 -- > .../LvfsGenCapsuleMinnowMaxRelease.bat| 139 -- > .../LvfsGenCapsuleSampleColor.bat | 145 --- > .../GenerateCapsule/template.metainfo.xml | 27 -- > .../Vlv2TbltDevicePkg/PlatformCapsuleIA32.dsc | 2 +- > .../Vlv2TbltDevicePkg/PlatformCapsuleX64.dsc | 2 +- > 16 files changed, 399 insertions(+), 1126 deletions(-) > delete mode 100644 > Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenC > apsuleAll.bat > create mode 100644 > Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenC > apsuleAll.py > delete mode 100755 > Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenC > apsuleAll.sh > delete mode 100644 > Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenC > apsuleMinnowMax.bat > delete mode 100644 > Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenC > apsuleMinnowMax.sh > delete mode 100644 > Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenC > apsuleMinnowMaxRelease.bat > delete mode 100644 > Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenC > apsuleMinnowMaxRelease.sh > delete mode 100644 > Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenC > apsuleSampleColor.bat > delete mode 100644 > Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenC > apsuleSampleColor.sh > delete mode 100644 > Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Lvfs.d > df > delete mode 100644 > Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/LvfsG > enCapsuleMinnowMax.bat > delete mode 100644 > Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/LvfsG > enCapsuleMinnowMaxRelease.bat > delete mode 100644 > Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/LvfsG > enCapsuleSampleColor.bat > delete mode 100644 > Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/templ > ate.metainfo.xml > > diff --git > a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Ge > nCapsuleAll.bat > b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Ge > nCapsuleAll.bat > deleted file mode 100644 > index 8f589565fa..00 > --- > a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Ge > nCapsuleAll.bat > +++ /dev/null > @@ -1,35 +0,0 @@ > -@REM @file > -@REM Windows batch file to generate UEFI capsules for system firmware > and > -@REM firmware for sample devices > -@REM > -@REM Copyright (c) 2018, Intel Corporation. All rights reserved. > -@REM SPDX-License-Identifier: BSD-2-Clause-Patent > -@REM > - > -@echo off > -setlocal > -cd /d %~dp0 > - > -rmdir /s /q %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules > -mkdir %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules > - > mkdir %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\SampleDevelopm > ent > -mkdir %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\NewCert > -mkdir %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\TestCert > - > copy %WORKSPACE%\Build\Vlv2TbltDevicePkg\DEBUG_VS2015x86\X64\Cap > suleApp.efi %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\SampleDeve > lopment\CapsuleApp.efi > - > copy %WORKSPACE%\Build\Vlv2TbltDevicePkg\RELEASE_VS2015x86\X64\Ca > psuleApp.efi %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\SampleDev > elopment\CapsuleAppRelease.efi > - > copy %WORKSPACE
[edk2-devel] [edk2-platforms Patch V3 04/12] Vlv2TbltDevicePkg: Convert BAT/sh Capsule scripts to Python
Convert all the BAT/sh files used to generate capsules to OS independent Python script. Cc: Zailiang Sun Cc: Yi Qian Cc: Gary Lin Signed-off-by: Michael D Kinney Reviewed-by: Zailiang Sun --- .../Capsule/GenerateCapsule/GenCapsuleAll.bat | 35 -- .../Capsule/GenerateCapsule/GenCapsuleAll.py | 397 ++ .../Capsule/GenerateCapsule/GenCapsuleAll.sh | 33 -- .../GenerateCapsule/GenCapsuleMinnowMax.bat | 131 -- .../GenerateCapsule/GenCapsuleMinnowMax.sh| 59 --- .../GenCapsuleMinnowMaxRelease.bat| 131 -- .../GenCapsuleMinnowMaxRelease.sh | 64 --- .../GenerateCapsule/GenCapsuleSampleColor.bat | 137 -- .../GenerateCapsule/GenCapsuleSampleColor.sh | 70 --- .../Feature/Capsule/GenerateCapsule/Lvfs.ddf | 14 - .../LvfsGenCapsuleMinnowMax.bat | 139 -- .../LvfsGenCapsuleMinnowMaxRelease.bat| 139 -- .../LvfsGenCapsuleSampleColor.bat | 145 --- .../GenerateCapsule/template.metainfo.xml | 27 -- .../Vlv2TbltDevicePkg/PlatformCapsuleIA32.dsc | 2 +- .../Vlv2TbltDevicePkg/PlatformCapsuleX64.dsc | 2 +- 16 files changed, 399 insertions(+), 1126 deletions(-) delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.bat create mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.py delete mode 100755 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.sh delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMax.bat delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMax.sh delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMaxRelease.bat delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMaxRelease.sh delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleSampleColor.bat delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleSampleColor.sh delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Lvfs.ddf delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/LvfsGenCapsuleMinnowMax.bat delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/LvfsGenCapsuleMinnowMaxRelease.bat delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/LvfsGenCapsuleSampleColor.bat delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/template.metainfo.xml diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.bat b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.bat deleted file mode 100644 index 8f589565fa..00 --- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.bat +++ /dev/null @@ -1,35 +0,0 @@ -@REM @file -@REM Windows batch file to generate UEFI capsules for system firmware and -@REM firmware for sample devices -@REM -@REM Copyright (c) 2018, Intel Corporation. All rights reserved. -@REM SPDX-License-Identifier: BSD-2-Clause-Patent -@REM - -@echo off -setlocal -cd /d %~dp0 - -rmdir /s /q %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules -mkdir %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules -mkdir %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\SampleDevelopment -mkdir %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\NewCert -mkdir %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\TestCert -copy %WORKSPACE%\Build\Vlv2TbltDevicePkg\DEBUG_VS2015x86\X64\CapsuleApp.efi %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\SampleDevelopment\CapsuleApp.efi -copy %WORKSPACE%\Build\Vlv2TbltDevicePkg\RELEASE_VS2015x86\X64\CapsuleApp.efi %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\SampleDevelopment\CapsuleAppRelease.efi -copy %WORKSPACE%\Build\Vlv2TbltDevicePkg\DEBUG_VS2015x86\X64\CapsuleApp.efi %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\NewCert\CapsuleApp.efi -copy %WORKSPACE%\Build\Vlv2TbltDevicePkg\RELEASE_VS2015x86\X64\CapsuleApp.efi %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\NewCert\CapsuleAppRelease.efi -copy %WORKSPACE%\Build\Vlv2TbltDevicePkg\DEBUG_VS2015x86\X64\CapsuleApp.efi %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\TestCert\CapsuleApp.efi -copy %WORKSPACE%\Build\Vlv2TbltDevicePkg\RELEASE_VS2015x86\X64\CapsuleApp.efi %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\TestCert\CapsuleAppRelease.efi - -call GenCapsuleMinnowMax.bat -call GenCapsuleMinnowMaxRelease.bat -call GenCapsuleSampleColor.bat Blue 149da854-7d19-4faa-a91e-862ea1324be6 -call GenCapsuleSampleColor.bat Green 79179bfd-704d-4c90-9e02-0ab8d968c18a -call GenCapsuleSampleColor.bat Red 72e2945a-00da-448e-9aa7-075ad840f9d4 - -call LvfsGenCapsuleMinnowMax.bat -call LvfsGenCapsuleMinnowMaxRelease.bat -call
