From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: zailiang.sun@intel.com) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by groups.io with SMTP; Thu, 11 Jul 2019 19:37:06 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Jul 2019 19:37:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,480,1557212400"; d="scan'208";a="166557306" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by fmsmga008.fm.intel.com with ESMTP; 11 Jul 2019 19:37:05 -0700 Received: from shsmsx107.ccr.corp.intel.com (10.239.4.96) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 11 Jul 2019 19:37:05 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.110]) by SHSMSX107.ccr.corp.intel.com ([169.254.9.162]) with mapi id 14.03.0439.000; Fri, 12 Jul 2019 10:37:00 +0800 From: "Sun, Zailiang" To: "Kinney, Michael D" , "devel@edk2.groups.io" CC: Gary Lin , "Qian, Yi" Subject: Re: [edk2-platforms Patch 11/28] Vlv2TbltDevicePkg/GenerateCapsule: Fix the bash scripts Thread-Topic: [edk2-platforms Patch 11/28] Vlv2TbltDevicePkg/GenerateCapsule: Fix the bash scripts Thread-Index: AQHVN1J1COxYg8etSEOmCaEhRfo2JabGRrAQ Date: Fri, 12 Jul 2019 02:37:00 +0000 Message-ID: <7CB7EF03E15B5D48981329A508747A9850C9638D@SHSMSX104.ccr.corp.intel.com> References: <20190710190516.6012-1-michael.d.kinney@intel.com> <20190710190516.6012-12-michael.d.kinney@intel.com> In-Reply-To: <20190710190516.6012-12-michael.d.kinney@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: zailiang.sun@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-By: Zailiang Sun -----Original Message----- From: Kinney, Michael D=20 Sent: Thursday, July 11, 2019 3:05 AM To: devel@edk2.groups.io Cc: Gary Lin ; Sun, Zailiang ; Qian,= Yi Subject: [edk2-platforms Patch 11/28] Vlv2TbltDevicePkg/GenerateCapsule: Fi= x the bash scripts 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 =3D= > 100755 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/G= enCapsuleAll.sh diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsu= le/GenCapsuleAll.sh b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/Gene= rateCapsule/GenCapsuleAll.sh old mode 100644 new mode 100755 index 040024553a..7b77b50c3f --- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenC= apsuleAll.sh +++ b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/G +++ enCapsuleAll.sh @@ -9,20 +9,25 @@ =20 cd $(dirname $0) =20 -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 $WORK= SPACE/Build/Vlv2TbltDevicePkg/Capsules/SampleDevelopment/CapsuleApp.efi -cp $WORKSPACE/Build/Vlv2TbltDevicePkg/RELEASE_GCC49/X64/CapsuleApp.efi $WO= RKSPACE/Build/Vlv2TbltDevicePkg/Capsules/SampleDevelopment/CapsuleAppReleas= e.efi -cp $WORKSPACE/Build/Vlv2TbltDevicePkg/DEBUG_GCC49/X64/CapsuleApp.efi $WORK= SPACE/Build/Vlv2TbltDevicePkg/Capsules/NewCert/CapsuleApp.efi -cp $WORKSPACE/Build/Vlv2TbltDevicePkg/RELEASE_GCC49/X64/CapsuleApp.efi $WO= RKSPACE/Build/Vlv2TbltDevicePkg/Capsules/NewCert/CapsuleAppRelease.efi -cp $WORKSPACE/Build/Vlv2TbltDevicePkg/DEBUG_GCC49/X64/CapsuleApp.efi $WORK= SPACE/Build/Vlv2TbltDevicePkg/Capsules/TestCert/CapsuleApp.efi -cp $WORKSPACE/Build/Vlv2TbltDevicePkg/RELEASE_GCC49/X64/CapsuleApp.efi $WO= RKSPACE/Build/Vlv2TbltDevicePkg/Capsules/TestCert/CapsuleAppRelease.efi +EFI_DIR=3D$WORKSPACE/Build/Vlv2TbltDevicePkg/${TARGET}_${TOOL_CHAIN_TAG}/ +X64/ CAP_DIR=3D$WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules +SCRIPT_DIR=3D$WORKSPACE/edk2-platforms/Platform/Intel/Vlv2TbltDevicePkg/F +eature/Capsule/GenerateCapsule =20 -. 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" =3D=3D "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/CapsuleAppReleas= e.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 =20 +149DA854-7D19-4FAA-A91E-862EA1324BE6 +. $SCRIPT_DIR/GenCapsuleSampleColor.sh Green 79179BFD-704D-4C90-9E02-0AB8D= 968C18A +. $SCRIPT_DIR/GenCapsuleSampleColor.sh Red 72E2945A-00DA-448E-9AA7-075AD= 840F9D4 diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsu= le/GenCapsuleMinnowMax.sh b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsul= e/GenerateCapsule/GenCapsuleMinnowMax.sh index 4fb963c93c..114c4a3477 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenC= apsuleMinnowMax.sh +++ b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/G +++ enCapsuleMinnowMax.sh @@ -13,7 +13,10 @@ FMP_CAPSULE_VERSION=3D0x0000000C FMP_CAPSULE_STRING=3D0.0.0.12 FMP_CAPSULE_NAME=3D"Intel MinnowMax DEBUG UEFI $FMP_CAPSULE_STRING" FMP_CAPSULE_LSV=3D0x00000000 -FMP_CAPSULE_PAYLOAD=3D$WORKSPACE/Build/Vlv2TbltDevicePkg/DEBUG_GCC49/FV/Vl= v.ROM +FMP_CAPSULE_PAYLOAD=3D$WORKSPACE/Build/Vlv2TbltDevicePkg/DEBUG_${TOOL_CHA +IN_TAG}/FV/Vlv.ROM=20 +FMP_CAPSULE_DIR=3D$WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/ + +PKCS7SIGN_DIR=3D$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sign/ =20 if [ ! -e "$FMP_CAPSULE_PAYLOAD" ] ; then return @@ -34,12 +37,8 @@ if [ -e NewCert.pem ]; then --signer-private-cert=3DNewCert.pem \ --other-public-cert=3DNewSub.pub.pem \ --trusted-public-cert=3DNewRoot.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 =20 # @@ -53,13 +52,8 @@ GenerateCapsule \ --lsv $FMP_CAPSULE_LSV \ --capflag PersistAcrossReset \ --capflag InitiateReset \ - --signer-private-cert=3D$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sig= n/TestCert.pem \ - --other-public-cert=3D$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sign/= TestSub.pub.pem \ - --trusted-public-cert=3D$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sig= n/TestRoot.pub.pem \ - -o $FMP_CAPSULE_FILE \ + --signer-private-cert=3D$PKCS7SIGN_DIR/TestCert.pem \ =20 + --other-public-cert=3D$PKCS7SIGN_DIR/TestSub.pub.pem \ =20 + --trusted-public-cert=3D$PKCS7SIGN_DIR/TestRoot.pub.pem \ -o=20 + $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/GenerateCapsu= le/GenCapsuleMinnowMaxRelease.sh b/Platform/Intel/Vlv2TbltDevicePkg/Feature= /Capsule/GenerateCapsule/GenCapsuleMinnowMaxRelease.sh index 29d46dad1e..d2619786e8 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenC= apsuleMinnowMaxRelease.sh +++ b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/G +++ enCapsuleMinnowMaxRelease.sh @@ -13,7 +13,10 @@ FMP_CAPSULE_VERSION=3D0x0000000C FMP_CAPSULE_STRING=3D0.0.0.12 FMP_CAPSULE_NAME=3D"Intel MinnowMax RELEASE UEFI $FMP_CAPSULE_STRING" FMP_CAPSULE_LSV=3D0x00000000 -FMP_CAPSULE_PAYLOAD=3D$WORKSPACE/Build/Vlv2TbltDevicePkg/RELEASE_GCC49/FV/= Vlv.ROM +FMP_CAPSULE_PAYLOAD=3D$WORKSPACE/Build/Vlv2TbltDevicePkg/RELEASE_${TOOL_C +HAIN_TAG}/FV/Vlv.ROM=20 +FMP_CAPSULE_DIR=3D$WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/ + +PKCS7SIGN_DIR=3D$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sign/ =20 if [ ! -e "$FMP_CAPSULE_PAYLOAD" ] ; then return @@ -34,12 +37,8 @@ if [ -e NewCert.pem ]; then --signer-private-cert=3DNewCert.pem \ --other-public-cert=3DNewSub.pub.pem \ --trusted-public-cert=3DNewRoot.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 =20 # @@ -53,10 +52,10 @@ GenerateCapsule \ --lsv $FMP_CAPSULE_LSV \ --capflag PersistAcrossReset \ --capflag InitiateReset \ - --signer-private-cert=3D$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sig= n/TestCert.pem \ - --other-public-cert=3D$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sign/= TestSub.pub.pem \ - --trusted-public-cert=3D$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sig= n/TestRoot.pub.pem \ - -o $FMP_CAPSULE_FILE \ + --signer-private-cert=3D$PKCS7SIGN_DIR/TestCert.pem \ =20 + --other-public-cert=3D$PKCS7SIGN_DIR/TestSub.pub.pem \ =20 + --trusted-public-cert=3D$PKCS7SIGN_DIR/TestRoot.pub.pem \ -o=20 + $FMP_CAPSULE_DIR/TestCert/$FMP_CAPSULE_FILE \ $FMP_CAPSULE_PAYLOAD =20 cp $FMP_CAPSULE_FILE $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/TestCert -- 2.21.0.windows.1