From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.20, mailfrom: michael.d.kinney@intel.com) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by groups.io with SMTP; Wed, 10 Jul 2019 12:05:21 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2019 12:05:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,475,1557212400"; d="scan'208";a="171008178" Received: from mdkinney-mobl2.amr.corp.intel.com ([10.241.98.74]) by orsmga006.jf.intel.com with ESMTP; 10 Jul 2019 12:05:19 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Gary Lin , Zailiang Sun , Yi Qian Subject: [edk2-platforms Patch 11/28] Vlv2TbltDevicePkg/GenerateCapsule: Fix the bash scripts Date: Wed, 10 Jul 2019 12:04:59 -0700 Message-Id: <20190710190516.6012-12-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190710190516.6012-1-michael.d.kinney@intel.com> References: <20190710190516.6012-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Gary Lin Adjust the paths to fit the current directory structure Cc: Zailiang Sun Cc: Yi Qian Cc: Michael D Kinney Signed-off-by: Gary Lin --- .../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