From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: bsdio.com, ip: 65.103.231.193, mailfrom: rebecca@bsdio.com) Received: from muon.bsdio.com (muon.bsdio.com [65.103.231.193]) by groups.io with SMTP; Fri, 12 Jul 2019 20:53:49 -0700 Received: from muon.bsdio.com (localhost [127.0.0.1]) by muon.bsdio.com (Postfix) with ESMTP id 98AD3769BD; Fri, 12 Jul 2019 21:54:08 -0600 (MDT) Received: from muon.bsdio.com ([127.0.0.1]) by muon.bsdio.com (muon.bsdio.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id F2Tk7wpHR0KL; Fri, 12 Jul 2019 21:54:08 -0600 (MDT) Received: from photon.int.bluestop.org (unknown [10.0.10.170]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by muon.bsdio.com (Postfix) with ESMTPSA; Fri, 12 Jul 2019 21:54:07 -0600 (MDT) From: rebecca@bsdio.com To: devel@edk2.groups.io, Zailiang Sun , Yi Qian , michael.d.kinney@intel.com Cc: Rebecca Cran Subject: [PATCH] Platform/Intel/Vlv2TbltDevicePkg: fix postbuild scripts Date: Fri, 12 Jul 2019 21:53:39 -0600 Message-Id: <20190713035339.42992-1-rebecca@bsdio.com> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Add "set -e" to postbuild scripts to cause them to exit if an error occurs. Since GenCapsuleSampleColor.sh is passed arguments, it should be run directly and not sourced into the environment so it can evaluate $1, $2 etc. Otherwise, it tries to use the toolchain name passed to 'build' as the GUID string. Signed-off-by: Rebecca Cran --- .../Feature/Capsule/GenerateCapsule/GenCapsuleAll.sh | 10 ++++++---- .../Capsule/GenerateCapsule/GenCapsuleMinnowMax.sh | 2 ++ .../GenerateCapsule/GenCapsuleMinnowMaxRelease.sh | 2 ++ .../Capsule/GenerateCapsule/GenCapsuleSampleColor.sh | 0 4 files changed, 10 insertions(+), 4 deletions(-) mode change 100644 =3D> 100755 Platform/Intel/Vlv2TbltDevicePkg/Feature/= Capsule/GenerateCapsule/GenCapsuleSampleColor.sh diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCap= sule/GenCapsuleAll.sh b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/= GenerateCapsule/GenCapsuleAll.sh index 7b77b50c3f..22ae72c575 100755 --- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Ge= nCapsuleAll.sh +++ b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Ge= nCapsuleAll.sh @@ -1,5 +1,5 @@ # @file -# Linux script file to generate UEFI capsules for system firmware and +# *NIX script file to generate UEFI capsules for system firmware and # firmware for sample devices # # Copyright (c) 2018, Intel Corporation. All rights reserved.
@@ -7,6 +7,8 @@ # SPDX-License-Identifier: BSD-2-Clause-Patent # =20 +set -e + cd $(dirname $0) =20 EFI_DIR=3D$WORKSPACE/Build/Vlv2TbltDevicePkg/${TARGET}_${TOOL_CHAIN_TAG}= /X64/ @@ -28,6 +30,6 @@ else cp $EFI_DIR/CapsuleApp.efi $CAP_DIR/TestCert/CapsuleAppRelease.efi . $SCRIPT_DIR/GenCapsuleMinnowMaxRelease.sh fi -. $SCRIPT_DIR/GenCapsuleSampleColor.sh Blue 149DA854-7D19-4FAA-A91E-862= EA1324BE6 -. $SCRIPT_DIR/GenCapsuleSampleColor.sh Green 79179BFD-704D-4C90-9E02-0AB= 8D968C18A -. $SCRIPT_DIR/GenCapsuleSampleColor.sh Red 72E2945A-00DA-448E-9AA7-075= AD840F9D4 +$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/GenerateCap= sule/GenCapsuleMinnowMax.sh b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Ca= psule/GenerateCapsule/GenCapsuleMinnowMax.sh index 114c4a3477..1c9e3613f6 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Ge= nCapsuleMinnowMax.sh +++ b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Ge= nCapsuleMinnowMax.sh @@ -6,6 +6,8 @@ # SPDX-License-Identifier: BSD-2-Clause-Patent # =20 +set -e + FMP_CAPSULE_VENDOR=3DIntel FMP_CAPSULE_GUID=3D4096267B-DA0A-42EB-B5EB-FEF31D207CB4 FMP_CAPSULE_FILE=3DMinnowMax.cap diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCap= sule/GenCapsuleMinnowMaxRelease.sh b/Platform/Intel/Vlv2TbltDevicePkg/Fea= ture/Capsule/GenerateCapsule/GenCapsuleMinnowMaxRelease.sh index d2619786e8..e50ef66c03 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Ge= nCapsuleMinnowMaxRelease.sh +++ b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Ge= nCapsuleMinnowMaxRelease.sh @@ -6,6 +6,8 @@ # SPDX-License-Identifier: BSD-2-Clause-Patent # =20 +set -e + FMP_CAPSULE_VENDOR=3DIntel FMP_CAPSULE_GUID=3D4096267B-DA0A-42EB-B5EB-FEF31D207CB4 FMP_CAPSULE_FILE=3DMinnowMaxRelease.cap diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCap= sule/GenCapsuleSampleColor.sh b/Platform/Intel/Vlv2TbltDevicePkg/Feature/= Capsule/GenerateCapsule/GenCapsuleSampleColor.sh old mode 100644 new mode 100755 --=20 2.22.0