From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: bluestop.org, ip: 65.103.231.193, mailfrom: rebecca@bluestop.org) Received: from muon.bsdio.com (muon.bsdio.com [65.103.231.193]) by groups.io with SMTP; Fri, 12 Jul 2019 20:58:55 -0700 Received: from muon.bsdio.com (localhost [127.0.0.1]) by muon.bsdio.com (Postfix) with ESMTP id CA4EF769D3; Fri, 12 Jul 2019 21:59:14 -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 eX9vewS64hWd; Fri, 12 Jul 2019 21:59:13 -0600 (MDT) Received: from [10.0.10.197] (unknown [10.0.10.197]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by muon.bsdio.com (Postfix) with ESMTPSA; Fri, 12 Jul 2019 21:59:13 -0600 (MDT) Mime-Version: 1.0 (1.0) Subject: Re: [edk2-devel] [PATCH] Platform/Intel/Vlv2TbltDevicePkg: fix postbuild scripts From: Rebecca Cran X-Mailer: iPhone Mail (16F203) In-Reply-To: <15B0DB2695F34282.8514@groups.io> Date: Fri, 12 Jul 2019 21:58:53 -0600 Cc: Zailiang Sun , Yi Qian , michael.d.kinney@intel.com Message-Id: <2132444A-9F73-42EF-A975-BAB8436A9268@bluestop.org> References: <15B0DB2695F34282.8514@groups.io> To: devel@edk2.groups.io, rebecca@bsdio.com Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Sorry, I forgot to mention this is for edk2-platforms. > On Jul 12, 2019, at 9:53 PM, rebecca@bsdio.com wrote: >=20 > Add "set -e" to postbuild scripts to cause them to exit if an error > occurs. >=20 > 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. >=20 > 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 >=20 > diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCa= psule/GenCapsuleAll.sh b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/G= enerateCapsule/GenCapsuleAll.sh > index 7b77b50c3f..22ae72c575 100755 > --- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/G= enCapsuleAll.sh > +++ b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/G= enCapsuleAll.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-86= 2EA1324BE6 > -. $SCRIPT_DIR/GenCapsuleSampleColor.sh Green 79179BFD-704D-4C90-9E02-0A= B8D968C18A > -. $SCRIPT_DIR/GenCapsuleSampleColor.sh Red 72E2945A-00DA-448E-9AA7-07= 5AD840F9D4 > +$SCRIPT_DIR/GenCapsuleSampleColor.sh Blue 149DA854-7D19-4FAA-A91E-862E= A1324BE6 > +$SCRIPT_DIR/GenCapsuleSampleColor.sh Green 79179BFD-704D-4C90-9E02-0AB8= D968C18A > +$SCRIPT_DIR/GenCapsuleSampleColor.sh Red 72E2945A-00DA-448E-9AA7-075A= D840F9D4 > diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCa= psule/GenCapsuleMinnowMax.sh b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Cap= sule/GenerateCapsule/GenCapsuleMinnowMax.sh > index 114c4a3477..1c9e3613f6 100644 > --- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/G= enCapsuleMinnowMax.sh > +++ b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/G= enCapsuleMinnowMax.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/GenerateCa= psule/GenCapsuleMinnowMaxRelease.sh b/Platform/Intel/Vlv2TbltDevicePkg/Feat= ure/Capsule/GenerateCapsule/GenCapsuleMinnowMaxRelease.sh > index d2619786e8..e50ef66c03 100644 > --- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/G= enCapsuleMinnowMaxRelease.sh > +++ b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/G= enCapsuleMinnowMaxRelease.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/GenerateCa= psule/GenCapsuleSampleColor.sh b/Platform/Intel/Vlv2TbltDevicePkg/Feature/C= apsule/GenerateCapsule/GenCapsuleSampleColor.sh > old mode 100644 > new mode 100755 > --=20 > 2.22.0 >=20 >=20 >=20 >=20