From nobody Sun Feb 8 22:34:00 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+43507+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+43507+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1562785523; cv=none; d=zoho.com; s=zohoarc; b=F6lq0L0zIsIozt6+ymSy5OPJfR8t7JUOGl5zXMVGTSA2QvYzsgIaZ0DJFNgMPSWnPYFk7VkZWLzWG7vsP0jDmxvQAd5H0UsvV002gQQ+chi9qOQuqMvr9rbBPHLOAynLGXnvJDuY8NHLwuSWASCW05LeN1veAcdWPieNqA67pXM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562785523; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=cdPtVoZjzbxDqcg1cLAN6WIZi17P92a98Jk2bBc6wBM=; b=JRdOyMkQJtMlaBUB3qyGYXHDiiWcEGoyaqtW8ZOCUyezZbLkVZAIAyxvkfOJWuxvBPS+av37A3YophpmpcXcJgBjhfKR9HAIowc0mNEj08HxmtxKtjxVnDHJqws49m9ZQZ2CfObe52TchQ93Iu9yTGjzI5Lf5dFhDA0Z9eVFWwc= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+43507+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1562785523300890.8937087120752; Wed, 10 Jul 2019 12:05:23 -0700 (PDT) Return-Path: X-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 X-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" X-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-devel] [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> In-Reply-To: <20190710190516.6012-1-michael.d.kinney@intel.com> References: <20190710190516.6012-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1562785522; bh=sDpgERABBGrT/QDwTmNRAXEqYm1TixeyceGGDYaWdZY=; h=Cc:Date:From:Reply-To:Subject:To; b=A3hINRjRRQXbtO4VoxmpreYSaUgLgMj6EEWixPj1jW+CoUlG0Coawc0ulBpjgoUgLdp iImHfL1Tiv6TkFx3uPPO6PPVrhMXMVsTkDvG7iiUdRQx0nzqR7+HEVYMVpPiBksP31RYu CRd6y5ZEmJZEHfRAEu6sqtiv44C8e8RGku8= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" 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 Reviewed-By: Zailiang Sun --- .../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/Ca= psule/GenerateCapsule/GenCapsuleAll.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/GenC= apsuleAll.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}/X= 64/ +CAP_DIR=3D$WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules +SCRIPT_DIR=3D$WORKSPACE/edk2-platforms/Platform/Intel/Vlv2TbltDevicePkg/Fe= ature/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 149DA854-7D19-4FAA-A91E-862EA= 1324BE6 +. $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/GenC= apsuleMinnowMax.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_CHAI= N_TAG}/FV/Vlv.ROM +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 \ + --other-public-cert=3D$PKCS7SIGN_DIR/TestSub.pub.pem \ + --trusted-public-cert=3D$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/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/GenC= apsuleMinnowMaxRelease.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_CH= AIN_TAG}/FV/Vlv.ROM +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 \ + --other-public-cert=3D$PKCS7SIGN_DIR/TestSub.pub.pem \ + --trusted-public-cert=3D$PKCS7SIGN_DIR/TestRoot.pub.pem \ + -o $FMP_CAPSULE_DIR/TestCert/$FMP_CAPSULE_FILE \ $FMP_CAPSULE_PAYLOAD =20 cp $FMP_CAPSULE_FILE $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/TestCert --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#43507): https://edk2.groups.io/g/devel/message/43507 Mute This Topic: https://groups.io/mt/32419740/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-