From f2197f0d0c3dc001af541a50d986771f9b27da7d Mon Sep 17 00:00:00 2001 From: Michael D Kinney Date: Wed, 8 May 2019 15:12:41 -0700 Subject: [PATCH] Vlv2TbltDevicePkg/Capsule: Remove path to openssl tools Remove path to openssl tools from batch scripts. Instead, the path to the openssl tools must be included in PATH for a build to complete. Cc: Zailiang Sun Cc: Yi Qian Signed-off-by: Michael D Kinney Reviewed-by: Zailiang Sun Reviewed-by: Yi Qian --- .../Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMax.bat | 2 -- .../Capsule/GenerateCapsule/GenCapsuleMinnowMaxRelease.bat | 2 -- .../Feature/Capsule/GenerateCapsule/GenCapsuleSampleColor.bat | 2 -- 3 files changed, 6 deletions(-) diff --git a/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMax.bat b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMax.bat index 80f9be7fb8..50ebb160ee 100644 --- a/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMax.bat +++ b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMax.bat @@ -69,7 +69,6 @@ if exist "NewCert.pem" ( --lsv %FMP_CAPSULE_LSV% ^ --capflag PersistAcrossReset ^ --capflag InitiateReset ^ - --signing-tool-path=c:\OpenSSL-Win32\bin ^ --signer-private-cert=NewCert.pem ^ --other-public-cert=NewSub.pub.pem ^ --trusted-public-cert=NewRoot.pub.pem ^ @@ -106,7 +105,6 @@ call GenerateCapsule ^ --lsv %FMP_CAPSULE_LSV% ^ --capflag PersistAcrossReset ^ --capflag InitiateReset ^ - --signing-tool-path=c:\OpenSSL-Win32\bin ^ --signer-private-cert=%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Sign\TestCert.pem ^ --other-public-cert=%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Sign\TestSub.pub.pem ^ --trusted-public-cert=%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Sign\TestRoot.pub.pem ^ diff --git a/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMaxRelease.bat b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMaxRelease.bat index c6c78f0285..9d08c86717 100644 --- a/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMaxRelease.bat +++ b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMaxRelease.bat @@ -69,7 +69,6 @@ if exist "NewCert.pem" ( --lsv %FMP_CAPSULE_LSV% ^ --capflag PersistAcrossReset ^ --capflag InitiateReset ^ - --signing-tool-path=c:\OpenSSL-Win32\bin ^ --signer-private-cert=NewCert.pem ^ --other-public-cert=NewSub.pub.pem ^ --trusted-public-cert=NewRoot.pub.pem ^ @@ -106,7 +105,6 @@ call GenerateCapsule ^ --lsv %FMP_CAPSULE_LSV% ^ --capflag PersistAcrossReset ^ --capflag InitiateReset ^ - --signing-tool-path=c:\OpenSSL-Win32\bin ^ --signer-private-cert=%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Sign\TestCert.pem ^ --other-public-cert=%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Sign\TestSub.pub.pem ^ --trusted-public-cert=%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Sign\TestRoot.pub.pem ^ diff --git a/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleSampleColor.bat b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleSampleColor.bat index ba4bc0f081..3e9f94c530 100644 --- a/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleSampleColor.bat +++ b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleSampleColor.bat @@ -73,7 +73,6 @@ if exist "NewCert.pem" ( --lsv %FMP_CAPSULE_LSV% ^ --capflag PersistAcrossReset ^ --capflag InitiateReset ^ - --signing-tool-path=c:\OpenSSL-Win32\bin ^ --signer-private-cert=NewCert.pem ^ --other-public-cert=NewSub.pub.pem ^ --trusted-public-cert=NewRoot.pub.pem ^ @@ -110,7 +109,6 @@ call GenerateCapsule ^ --lsv %FMP_CAPSULE_LSV% ^ --capflag PersistAcrossReset ^ --capflag InitiateReset ^ - --signing-tool-path=c:\OpenSSL-Win32\bin ^ --signer-private-cert=%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Sign\TestCert.pem ^ --other-public-cert=%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Sign\TestSub.pub.pem ^ --trusted-public-cert=%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Sign\TestRoot.pub.pem ^