1. Patchew
  2. EDK2
  3. [edk2-devel] [Patch 00/16] Vlv2TbltDevicePkg: Sync with edk2/master
  4. View patch

[edk2-devel] [Patch 14/16] Vlv2TbltDevicePkg/Capsule: Remove path to openssl tools

Michael D Kinney posted 16 patches 6 years, 9 months ago
[edk2-devel] [Patch 14/16] Vlv2TbltDevicePkg/Capsule: Remove path to openssl tools
Posted by Michael D Kinney 6 years, 9 months ago 
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 <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 .../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 ^
-- 
2.21.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40260): https://edk2.groups.io/g/devel/message/40260
Mute This Topic: https://groups.io/mt/31551783/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [Patch 14/16] Vlv2TbltDevicePkg/Capsule: Remove path to openssl tools
Posted by Qian, Yi 6 years, 9 months ago 
Reviewed by Qian, Yi <yi.qian@intel.com>

Thanks
QianYi

-----Original Message-----
From: Kinney, Michael D 
Sent: Thursday, May 9, 2019 12:31 PM
To: devel@edk2.groups.io
Cc: Sun, Zailiang <zailiang.sun@intel.com>; Qian, Yi <yi.qian@intel.com>
Subject: [Patch 14/16] 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 <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 .../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/GenCapsuleMinnow
+++ Max.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/GenCapsuleMinnow
+++ MaxRelease.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/GenCapsuleSample
+++ Color.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 ^
--
2.21.0.windows.1



-- 
Qian Yi

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40350): https://edk2.groups.io/g/devel/message/40350
Mute This Topic: https://groups.io/mt/31551783/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [Patch 14/16] Vlv2TbltDevicePkg/Capsule: Remove path to openssl tools
Posted by Sun, Zailiang 6 years, 9 months ago 
Reviewed-by: Zailiang Sun <zailiang.sun@intel.com>

> -----Original Message-----
> From: Kinney, Michael D
> Sent: Thursday, May 9, 2019 12:31 PM
> To: devel@edk2.groups.io
> Cc: Sun, Zailiang <zailiang.sun@intel.com>; Qian, Yi <yi.qian@intel.com>
> Subject: [Patch 14/16] 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 <zailiang.sun@intel.com>
> Cc: Yi Qian <yi.qian@intel.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
>  .../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/GenCapsuleMinno
> wMax.bat
> b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinno
> wMax.bat
> index 80f9be7fb8..50ebb160ee 100644
> ---
> a/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinno
> wMax.bat
> +++
> b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinno
> w
> +++ Max.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.p
> em ^
>    --other-public-
> cert=%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Sign\TestSub.p
> ub.pem ^
>    --trusted-public-
> cert=%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Sign\TestRoot.
> pub.pem ^ diff --git
> a/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinno
> wMaxRelease.bat
> b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinno
> wMaxRelease.bat
> index c6c78f0285..9d08c86717 100644
> ---
> a/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinno
> wMaxRelease.bat
> +++
> b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinno
> w
> +++ MaxRelease.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.p
> em ^
>    --other-public-
> cert=%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Sign\TestSub.p
> ub.pem ^
>    --trusted-public-
> cert=%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Sign\TestRoot.
> pub.pem ^ diff --git
> a/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleSampl
> eColor.bat
> b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleSampl
> eColor.bat
> index ba4bc0f081..3e9f94c530 100644
> ---
> a/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleSampl
> eColor.bat
> +++
> b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleSampl
> e
> +++ Color.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.p
> em ^
>    --other-public-
> cert=%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Sign\TestSub.p
> ub.pem ^
>    --trusted-public-
> cert=%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Sign\TestRoot.
> pub.pem ^
> --
> 2.21.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40301): https://edk2.groups.io/g/devel/message/40301
Mute This Topic: https://groups.io/mt/31551783/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.