From: "Michael D Kinney" <michael.d.kinney@intel.com>
To: devel@edk2.groups.io
Cc: Gary Lin <glin@suse.com>, Zailiang Sun <zailiang.sun@intel.com>,
Yi Qian <yi.qian@intel.com>
Subject: [edk2-platforms Patch 11/28] Vlv2TbltDevicePkg/GenerateCapsule: Fix the bash scripts
Date: Wed, 10 Jul 2019 12:04:59 -0700 [thread overview]
Message-ID: <20190710190516.6012-12-michael.d.kinney@intel.com> (raw)
In-Reply-To: <20190710190516.6012-1-michael.d.kinney@intel.com>
From: Gary Lin <glin@suse.com>
Adjust the paths to fit the current directory structure
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Gary Lin <glin@suse.com>
---
.../Capsule/GenerateCapsule/GenCapsuleAll.sh | 37 +++++++++++--------
.../GenerateCapsule/GenCapsuleMinnowMax.sh | 24 +++++-------
.../GenCapsuleMinnowMaxRelease.sh | 19 +++++-----
3 files changed, 39 insertions(+), 41 deletions(-)
mode change 100644 => 100755 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.sh
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.sh b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.sh
old mode 100644
new mode 100755
index 040024553a..7b77b50c3f
--- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.sh
+++ b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.sh
@@ -9,20 +9,25 @@
cd $(dirname $0)
-rm -R $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
-cp $WORKSPACE/Build/Vlv2TbltDevicePkg/DEBUG_GCC49/X64/CapsuleApp.efi $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/SampleDevelopment/CapsuleApp.efi
-cp $WORKSPACE/Build/Vlv2TbltDevicePkg/RELEASE_GCC49/X64/CapsuleApp.efi $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/SampleDevelopment/CapsuleAppRelease.efi
-cp $WORKSPACE/Build/Vlv2TbltDevicePkg/DEBUG_GCC49/X64/CapsuleApp.efi $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/NewCert/CapsuleApp.efi
-cp $WORKSPACE/Build/Vlv2TbltDevicePkg/RELEASE_GCC49/X64/CapsuleApp.efi $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/NewCert/CapsuleAppRelease.efi
-cp $WORKSPACE/Build/Vlv2TbltDevicePkg/DEBUG_GCC49/X64/CapsuleApp.efi $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/TestCert/CapsuleApp.efi
-cp $WORKSPACE/Build/Vlv2TbltDevicePkg/RELEASE_GCC49/X64/CapsuleApp.efi $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/TestCert/CapsuleAppRelease.efi
+EFI_DIR=$WORKSPACE/Build/Vlv2TbltDevicePkg/${TARGET}_${TOOL_CHAIN_TAG}/X64/
+CAP_DIR=$WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules
+SCRIPT_DIR=$WORKSPACE/edk2-platforms/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule
-. GenCapsuleMinnowMax.sh
-. GenCapsuleMinnowMaxRelease.sh
-. GenCapsuleSampleColor.sh Blue 149DA854-7D19-4FAA-A91E-862EA1324BE6
-. GenCapsuleSampleColor.sh Green 79179BFD-704D-4C90-9E02-0AB8D968C18A
-. GenCapsuleSampleColor.sh Red 72E2945A-00DA-448E-9AA7-075AD840F9D4
+rm -rf $CAP_DIR
+mkdir -p $CAP_DIR/SampleDevelopment
+mkdir -p $CAP_DIR/NewCert
+mkdir -p $CAP_DIR/TestCert
+if [ "$TARGET" == "DEBUG" ]; then
+ cp $EFI_DIR/CapsuleApp.efi $CAP_DIR/SampleDevelopment/CapsuleApp.efi
+ cp $EFI_DIR/CapsuleApp.efi $CAP_DIR/NewCert/CapsuleApp.efi
+ cp $EFI_DIR/CapsuleApp.efi $CAP_DIR/TestCert/CapsuleApp.efi
+ . $SCRIPT_DIR/GenCapsuleMinnowMax.sh
+else
+ cp $EFI_DIR/CapsuleApp.efi $CAP_DIR/SampleDevelopment/CapsuleAppRelease.efi
+ cp $EFI_DIR/CapsuleApp.efi $CAP_DIR/NewCert/CapsuleAppRelease.efi
+ cp $EFI_DIR/CapsuleApp.efi $CAP_DIR/TestCert/CapsuleAppRelease.efi
+ . $SCRIPT_DIR/GenCapsuleMinnowMaxRelease.sh
+fi
+. $SCRIPT_DIR/GenCapsuleSampleColor.sh Blue 149DA854-7D19-4FAA-A91E-862EA1324BE6
+. $SCRIPT_DIR/GenCapsuleSampleColor.sh Green 79179BFD-704D-4C90-9E02-0AB8D968C18A
+. $SCRIPT_DIR/GenCapsuleSampleColor.sh Red 72E2945A-00DA-448E-9AA7-075AD840F9D4
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMax.sh b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMax.sh
index 4fb963c93c..114c4a3477 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMax.sh
+++ b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMax.sh
@@ -13,7 +13,10 @@ FMP_CAPSULE_VERSION=0x0000000C
FMP_CAPSULE_STRING=0.0.0.12
FMP_CAPSULE_NAME="Intel MinnowMax DEBUG UEFI $FMP_CAPSULE_STRING"
FMP_CAPSULE_LSV=0x00000000
-FMP_CAPSULE_PAYLOAD=$WORKSPACE/Build/Vlv2TbltDevicePkg/DEBUG_GCC49/FV/Vlv.ROM
+FMP_CAPSULE_PAYLOAD=$WORKSPACE/Build/Vlv2TbltDevicePkg/DEBUG_${TOOL_CHAIN_TAG}/FV/Vlv.ROM
+FMP_CAPSULE_DIR=$WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/
+
+PKCS7SIGN_DIR=$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sign/
if [ ! -e "$FMP_CAPSULE_PAYLOAD" ] ; then
return
@@ -34,12 +37,8 @@ if [ -e NewCert.pem ]; then
--signer-private-cert=NewCert.pem \
--other-public-cert=NewSub.pub.pem \
--trusted-public-cert=NewRoot.pub.pem \
- -o $FMP_CAPSULE_FILE \
+ -o $FMP_CAPSULE_DIR/NewCert/$FMP_CAPSULE_FILE \
$FMP_CAPSULE_PAYLOAD
-
- cp $FMP_CAPSULE_FILE $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/NewCert
-
- rm $FMP_CAPSULE_FILE
fi
#
@@ -53,13 +52,8 @@ GenerateCapsule \
--lsv $FMP_CAPSULE_LSV \
--capflag PersistAcrossReset \
--capflag InitiateReset \
- --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 \
- -o $FMP_CAPSULE_FILE \
+ --signer-private-cert=$PKCS7SIGN_DIR/TestCert.pem \
+ --other-public-cert=$PKCS7SIGN_DIR/TestSub.pub.pem \
+ --trusted-public-cert=$PKCS7SIGN_DIR/TestRoot.pub.pem \
+ -o $FMP_CAPSULE_DIR/TestCert/$FMP_CAPSULE_FILE \
$FMP_CAPSULE_PAYLOAD
-
-cp $FMP_CAPSULE_FILE $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/TestCert
-
-rm $FMP_CAPSULE_FILE
-
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMaxRelease.sh b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMaxRelease.sh
index 29d46dad1e..d2619786e8 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMaxRelease.sh
+++ b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMaxRelease.sh
@@ -13,7 +13,10 @@ FMP_CAPSULE_VERSION=0x0000000C
FMP_CAPSULE_STRING=0.0.0.12
FMP_CAPSULE_NAME="Intel MinnowMax RELEASE UEFI $FMP_CAPSULE_STRING"
FMP_CAPSULE_LSV=0x00000000
-FMP_CAPSULE_PAYLOAD=$WORKSPACE/Build/Vlv2TbltDevicePkg/RELEASE_GCC49/FV/Vlv.ROM
+FMP_CAPSULE_PAYLOAD=$WORKSPACE/Build/Vlv2TbltDevicePkg/RELEASE_${TOOL_CHAIN_TAG}/FV/Vlv.ROM
+FMP_CAPSULE_DIR=$WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/
+
+PKCS7SIGN_DIR=$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sign/
if [ ! -e "$FMP_CAPSULE_PAYLOAD" ] ; then
return
@@ -34,12 +37,8 @@ if [ -e NewCert.pem ]; then
--signer-private-cert=NewCert.pem \
--other-public-cert=NewSub.pub.pem \
--trusted-public-cert=NewRoot.pub.pem \
- -o $FMP_CAPSULE_FILE \
+ -o $FMP_CAPSULE_DIR/NewCert/$FMP_CAPSULE_FILE \
$FMP_CAPSULE_PAYLOAD
-
- cp $FMP_CAPSULE_FILE $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/NewCert
-
- rm $FMP_CAPSULE_FILE
fi
#
@@ -53,10 +52,10 @@ GenerateCapsule \
--lsv $FMP_CAPSULE_LSV \
--capflag PersistAcrossReset \
--capflag InitiateReset \
- --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 \
- -o $FMP_CAPSULE_FILE \
+ --signer-private-cert=$PKCS7SIGN_DIR/TestCert.pem \
+ --other-public-cert=$PKCS7SIGN_DIR/TestSub.pub.pem \
+ --trusted-public-cert=$PKCS7SIGN_DIR/TestRoot.pub.pem \
+ -o $FMP_CAPSULE_DIR/TestCert/$FMP_CAPSULE_FILE \
$FMP_CAPSULE_PAYLOAD
cp $FMP_CAPSULE_FILE $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/TestCert
--
2.21.0.windows.1
next prev parent reply other threads:[~2019-07-10 19:05 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-10 19:04 [edk2-platforms Patch 00/28] Vlv2TbltDevicePkg: Fix Linux build issues Michael D Kinney
2019-07-10 19:04 ` [edk2-platforms Patch 01/28] Vlv2TbltDevicePkg/Build_IFWI.sh: Add "set -e" to exit on error Michael D Kinney
2019-07-11 4:46 ` Sun, Zailiang
2019-07-12 2:59 ` [edk2-devel] " rebecca
2019-07-10 19:04 ` [edk2-platforms Patch 02/28] Vlv2TbltDevicePkg/Build_IFWI.sh: Change the root directory path Michael D Kinney
2019-07-11 4:47 ` Sun, Zailiang
2019-07-12 3:03 ` [edk2-devel] " rebecca
2019-07-12 16:23 ` Michael D Kinney
2019-07-12 16:32 ` rebecca
2019-07-10 19:04 ` [edk2-platforms Patch 03/28] Vlv2TbltDevicePkg/bld_vlv.sh: Fix the log name Michael D Kinney
2019-07-11 4:47 ` Sun, Zailiang
2019-07-10 19:04 ` [edk2-platforms Patch 04/28] Vlv2TbltDevicePkg/bld_vlv.sh: Update the gcc version detection Michael D Kinney
2019-07-11 4:47 ` Sun, Zailiang
2019-07-10 19:04 ` [edk2-platforms Patch 05/28] Vlv2TbltDevicePkg/bld_vlv.sh: Remove ECP completely Michael D Kinney
2019-07-11 4:47 ` Sun, Zailiang
2019-07-10 19:04 ` [edk2-platforms Patch 06/28] Vlv2TbltDevicePkg/bld_vlv.sh: Update the script to fit edk2-platforms Michael D Kinney
2019-07-11 4:48 ` Sun, Zailiang
2019-07-10 19:04 ` [edk2-platforms Patch 07/28] Vlv2TbltDevicePkg: Add the missing headers to inf files Michael D Kinney
2019-07-11 4:48 ` Sun, Zailiang
2019-07-10 19:04 ` [edk2-platforms Patch 08/28] Vlv2TbltDevicePkg/bld_vlv.sh: Remove BiosId.env completely Michael D Kinney
2019-07-11 4:48 ` Sun, Zailiang
2019-07-10 19:04 ` [edk2-platforms Patch 09/28] Vlv2TbltDevicePkg/bld_vlv.sh: Correct the path to PlatformCapsuleGcc.dsc Michael D Kinney
2019-07-11 4:48 ` Sun, Zailiang
2019-07-10 19:04 ` [edk2-platforms Patch 10/28] Vlv2TbltDevicePkg/bld_vlv.sh: Create Vlv.ROM Michael D Kinney
2019-07-11 4:52 ` Sun, Zailiang
2019-07-11 6:08 ` [edk2-devel] " Gary Lin
2019-07-12 23:42 ` Michael D Kinney
2019-07-13 4:17 ` Sun, Zailiang
2019-07-10 19:04 ` Michael D Kinney [this message]
2019-07-12 2:37 ` [edk2-platforms Patch 11/28] Vlv2TbltDevicePkg/GenerateCapsule: Fix the bash scripts Sun, Zailiang
2019-07-10 19:05 ` [edk2-platforms Patch 12/28] Vlv2TbltDevicePkg/AcpiPlatform: Remove a unused variable Michael D Kinney
2019-07-12 2:37 ` Sun, Zailiang
2019-07-10 19:05 ` [edk2-platforms Patch 13/28] Vlv2TbltDevicePkg/AcpiPlatform: Fix the error from InstallAcpiTable Michael D Kinney
2019-07-12 2:37 ` Sun, Zailiang
2019-07-10 19:05 ` [edk2-platforms Patch 14/28] Vlv2TbltDevicePkg/SmBiosMiscDxe: Fix the indentation Michael D Kinney
2019-07-12 2:37 ` Sun, Zailiang
2019-07-10 19:05 ` [edk2-platforms Patch 15/28] Vlv2TbltDevicePkg: Import SD/MMC drivers Michael D Kinney
2019-07-12 2:37 ` [edk2-devel] " Sun, Zailiang
2019-07-10 19:05 ` [edk2-platforms Patch 16/28] Vlv2TbltDevicePkg: Update Linux build scripts Michael D Kinney
2019-07-11 4:55 ` [edk2-devel] " Sun, Zailiang
2019-07-10 19:05 ` [edk2-platforms Patch 17/28] Vlvt2TbltDevicePkg: Fix NULL pointer access in SmbiosMiscDxe Michael D Kinney
2019-07-11 4:53 ` Sun, Zailiang
2019-07-10 19:05 ` [edk2-platforms Patch 18/28] Vlv2TbltDevicePkg/Build_IFWI.sh: Check the WORKSPACE env variable Michael D Kinney
2019-07-12 2:37 ` Sun, Zailiang
2019-07-10 19:05 ` [edk2-platforms Patch 19/28] Vlv2DeviceRefCodePkg: Remove redundant gEfiSpiProtocolGuid Michael D Kinney
2019-07-11 4:53 ` Sun, Zailiang
2019-07-10 19:05 ` [edk2-platforms Patch 20/28] Vlv2TbltDevicePkg: " Michael D Kinney
2019-07-11 4:53 ` Sun, Zailiang
2019-07-10 19:05 ` [edk2-platforms Patch 21/28] Vlv2TbltDevicePkg: Re-enable BIOS ID feature Michael D Kinney
2019-07-11 4:54 ` Sun, Zailiang
2019-07-10 19:05 ` [edk2-platforms Patch 22/28] Vlv2TbltDevicePkg: Add GCC IA32 build support Michael D Kinney
2019-07-11 4:54 ` Sun, Zailiang
2019-07-10 19:05 ` [edk2-platforms Patch 23/28] Vlv2TbltDevicePkg: Import TlsLib for HTTPS Boot Michael D Kinney
2019-07-12 2:38 ` [edk2-devel] " Sun, Zailiang
2019-07-12 3:34 ` rebecca
2019-07-10 19:05 ` [edk2-platforms Patch 24/28] Vlv2TbltDevicePkg: Reorganize the libraries Michael D Kinney
2019-07-12 2:38 ` Sun, Zailiang
2019-07-10 19:05 ` [edk2-platforms Patch 25/28] Vlv2DeviceRefCodePlg/AcpiTablesPCAT: Fix ASL error Michael D Kinney
2019-07-11 4:54 ` Sun, Zailiang
2019-07-10 19:05 ` [edk2-platforms Patch 26/28] Vlv2TbltDevicePkg: Clean up all build scripts Michael D Kinney
2019-07-11 4:55 ` Sun, Zailiang
2019-07-12 3:39 ` [edk2-devel] " rebecca
2019-07-12 18:16 ` Michael D Kinney
2019-07-10 19:05 ` [edk2-platforms Patch 27/28] Vlv2TbltDevicePkg: Only build capsules for X64 Michael D Kinney
2019-07-11 4:55 ` Sun, Zailiang
2019-07-10 19:05 ` [edk2-platforms Patch 28/28] Vlv2TbltDevicePkg: Update Readme.md for multiple repos Michael D Kinney
2019-07-11 4:55 ` Sun, Zailiang
2019-07-12 2:38 ` [edk2-platforms Patch 00/28] Vlv2TbltDevicePkg: Fix Linux build issues Sun, Zailiang
2019-07-13 0:18 ` [edk2-devel] " Michael D Kinney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190710190516.6012-12-michael.d.kinney@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox