Re: [edk2-devel] [PATCH v6 1/5] MdePkg/Protocol/Hash: introduce GUID for SM3 digest algorithm
hi imran
Thank to create the new series.
I apologize that I overlooked this mdepkg update.
I checked uefi spec 2.8 and did not found this sm3 definition.
So I think this extension is only for edkii, not uefi spec. Am I right ?
If so, mdepkg is not the best place. The reason is that mdepkg can only include
industry standard, such as uefi, pi, acpi, smbios, etc.
I recommend we put this sm3 definition to security pkg as edkii extension only.
You may consider submit uefi ecr to add this to uefi spec at same time. But
there is no hard dependency.
If you are not sure how to do that, please drop me a mail and I can help you on
that.
Once sm3 is added in the next uefi spec, we may add sm3 to mdepkg at that time.
thank you!
Yao, Jiewen
> 在 2019年7月13日，上午8:47，Imran Desai 写道：
>
> BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1781
> GITHUB: https://github.com/idesai/edk2/tree/enable_sm3_measured_boot_v6
>
> EDK2 Support for SM3 digest algorithm is needed to enable TPM with SM3 PCR
> banks. This digest algorithm is part of the China Crypto algorithm suite.
> This integration has dependency on the openssl_1_1_1b integration into
> edk2.
>
> This patch adds GUID for SM3 digest algorithm.
>
> Cc: Michael D Kinney
> Cc: Liming Gao
>
> Signed-off-by: Imran Desai
> ---
> MdePkg/Include/Protocol/Hash.h | 5 +
> 1 file changed, 5 insertions(+)
>
> diff --git a/MdePkg/Include/Protocol/Hash.h b/MdePkg/Include/Protocol/Hash.h
> index 931d7916ef1e..8abf1a4fa305 100644
> --- a/MdePkg/Include/Protocol/Hash.h
> +++ b/MdePkg/Include/Protocol/Hash.h
> @@ -48,6 +48,11 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
> 0xcaa4381e, 0x750c, 0x4770, {0xb8, 0x70, 0x7a, 0x23, 0xb4, 0xe4, 0x21,
> 0x30 } \
> }
>
> +#define EFI_HASH_ALGORITHM_SM3_256_GUID \
> + { \
> +0x251C7818, 0x0DBF, 0xE619, { 0x7F, 0xC2, 0xD6, 0xAC, 0x43, 0x42, 0x7D,
> 0xA3 } \
> + }
> +
> #define EFI_HASH_ALGORTIHM_MD5_GUID \
> { \
> 0xaf7c79c, 0x65b5, 0x4319, {0xb0, 0xae, 0x44, 0xec, 0x48, 0x4e, 0x4a,
> 0xd7 } \
> --
> 2.17.0
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#43700): https://edk2.groups.io/g/devel/message/43700
Mute This Topic: https://groups.io/mt/32454898/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] Platform/Intel/Vlv2TbltDevicePkg: fix postbuild scripts
Sorry, I forgot to mention this is for edk2-platforms.
> On Jul 12, 2019, at 9:53 PM, rebe...@bsdio.com wrote:
>
> 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 => 100755
> Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleSampleColor.sh
>
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.sh
>
> b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.sh
> index 7b77b50c3f..22ae72c575 100755
> ---
> a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.sh
> +++
> b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.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
> #
>
> +set -e
> +
> cd $(dirname $0)
>
> EFI_DIR=$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-862EA1324BE6
> -. $SCRIPT_DIR/GenCapsuleSampleColor.sh Green
> 79179BFD-704D-4C90-9E02-0AB8D968C18A
> -. $SCRIPT_DIR/GenCapsuleSampleColor.sh Red
> 72E2945A-00DA-448E-9AA7-075AD840F9D4
> +$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 114c4a3477..1c9e3613f6 100644
> ---
> a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMax.sh
> +++
> b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMax.sh
> @@ -6,6 +6,8 @@
> # SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> +set -e
> +
> FMP_CAPSULE_VENDOR=Intel
> FMP_CAPSULE_GUID=4096267B-DA0A-42EB-B5EB-FEF31D207CB4
> FMP_CAPSULE_FILE=MinnowMax.cap
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMaxRelease.sh
>
> b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMaxRelease.sh
> index d2619786e8..e50ef66c03 100644
> ---
> a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMaxRelease.sh
> +++
> b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMaxRelease.sh
> @@ -6,6 +6,8 @@
> # SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> +set -e
> +
> FMP_CAPSULE_VENDOR=Intel
> FMP_CAPSULE_GUID=4096267B-DA0A-42EB-B5EB-FEF31D207CB4
> FMP_CAPSULE_FILE=MinnowMaxRelease.cap
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleSampleColor.sh
>
> b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleSampleColor.sh
> old mode 100644
> new mode 100755
> --
> 2.22.0
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#43699): https://edk2.groups.io/g/devel/message/43699
Mute This Topic: https://groups.io/mt/32456165/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] EmulatorPkg/Unix: Convert timezone from seconds to minutes
Reviewed-by: Ray Ni > -Original Message- > From: Justen, Jordan L > Sent: Saturday, July 13, 2019 4:08 PM > To: devel@edk2.groups.io > Cc: Justen, Jordan L ; Andrew Fish > ; Ni, Ray > Subject: [PATCH] EmulatorPkg/Unix: Convert timezone from seconds to minutes > > Fixes and assert seen when running ls under the shell. It appears the > assert was added in: > > commit 99849a906e15ea3a9a0330d69bbae0d21ff49808 > > ShellPkg/ls: Display the file time in local time. > > Signed-off-by: Jordan Justen > Cc: Andrew Fish > Cc: Ray Ni > --- > > For reference: https://linux.die.net/man/3/timezone > > EmulatorPkg/Unix/Host/EmuThunk.c| 2 +- > EmulatorPkg/Unix/Host/PosixFileSystem.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/EmulatorPkg/Unix/Host/EmuThunk.c > b/EmulatorPkg/Unix/Host/EmuThunk.c > index f1330c8234..665477e223 100644 > --- a/EmulatorPkg/Unix/Host/EmuThunk.c > +++ b/EmulatorPkg/Unix/Host/EmuThunk.c > @@ -363,7 +363,7 @@ SecGetTime ( >Time->Minute = tm->tm_min; >Time->Second = tm->tm_sec; >Time->Nanosecond = 0; > - Time->TimeZone = timezone; > + Time->TimeZone = timezone / 60; >Time->Daylight = (daylight ? EFI_TIME_ADJUST_DAYLIGHT : 0) > | (tm->tm_isdst > 0 ? EFI_TIME_IN_DAYLIGHT : 0); > > diff --git a/EmulatorPkg/Unix/Host/PosixFileSystem.c > b/EmulatorPkg/Unix/Host/PosixFileSystem.c > index 3149c6c3e0..5b74053498 100644 > --- a/EmulatorPkg/Unix/Host/PosixFileSystem.c > +++ b/EmulatorPkg/Unix/Host/PosixFileSystem.c > @@ -220,7 +220,7 @@ PosixSystemTimeToEfiTime ( >Time->Second = tm->tm_sec; >Time->Nanosecond = 0; > > - Time->TimeZone = timezone; > + Time->TimeZone = timezone / 60; >Time->Daylight = (daylight ? EFI_TIME_ADJUST_DAYLIGHT : 0) | (tm->tm_isdst > > 0 ? EFI_TIME_IN_DAYLIGHT : 0); > } > > -- > 2.22.0 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#43697): https://edk2.groups.io/g/devel/message/43697 Mute This Topic: https://groups.io/mt/32457224/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] EmulatorPkg/build.sh: Fix missing usage of -b BUILDTARGET parameter
Reviewed-by: Ray Ni
> -Original Message-
> From: Justen, Jordan L
> Sent: Saturday, July 13, 2019 3:42 PM
> To: devel@edk2.groups.io; Andrew Fish ; Ni, Ray
>
> Subject: Re: [PATCH] EmulatorPkg/build.sh: Fix missing usage of -b
> BUILDTARGET parameter
>
> On 2019-04-10 02:07:34, Jordan Justen wrote:
> > Signed-off-by: Jordan Justen
> > Cc: Andrew Fish
> > Cc: Ray Ni
>
> ping
>
> > ---
> > EmulatorPkg/build.sh | 10 +-
> > 1 file changed, 5 insertions(+), 5 deletions(-)
> >
> > diff --git a/EmulatorPkg/build.sh b/EmulatorPkg/build.sh
> > index 89fd26baca..75561c116a 100755
> > --- a/EmulatorPkg/build.sh
> > +++ b/EmulatorPkg/build.sh
> > @@ -1,7 +1,7 @@
> > #!/bin/bash
> > #
> > # Copyright (c) 2008 - 2011, Apple Inc. All rights reserved.
> > -# Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.
> > +# Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.
> > #
> > # SPDX-License-Identifier: BSD-2-Clause-Patent
> > #
> > @@ -188,7 +188,7 @@ do
> > done
> >
> > PLATFORMFILE=$WORKSPACE/EmulatorPkg/EmulatorPkg.dsc
> > -BUILD_DIR=$BUILD_OUTPUT_DIR/DEBUG_"$TARGET_TOOLS"
> > +BUILD_DIR="$BUILD_OUTPUT_DIR/${BUILDTARGET}_$TARGET_TOOLS"
> > BUILD_ROOT_ARCH=$BUILD_DIR/$PROCESSOR
> >
> > if [[ ! -f `which build` || ! -f `which GenFv` ]];
> > @@ -218,11 +218,11 @@ if [[ "$RUN_EMULATOR" == "yes" ]]; then
> >then
> ># only older versions of Xcode support -ccc-host-tripe, for newer
> > versions
> ># it is -target
> > -cp $WORKSPACE/EmulatorPkg/Unix/lldbefi.py
> > $BUILD_OUTPUT_DIR/DEBUG_"$TARGET_TOOLS"/$PROCESSOR
> > +cp $WORKSPACE/EmulatorPkg/Unix/lldbefi.py
> "$BUILD_OUTPUT_DIR/${BUILDTARGET}_$TARGET_TOOLS/$PROCESSOR"
> > cd $BUILD_ROOT_ARCH; /usr/bin/lldb --source
> > $WORKSPACE/EmulatorPkg/Unix/lldbinit Host
> > exit $?
> >else
> > -cp $WORKSPACE/EmulatorPkg/Unix/.gdbinit
> > $BUILD_OUTPUT_DIR/DEBUG_"$TARGET_TOOLS"/$PROCESSOR
> > +cp $WORKSPACE/EmulatorPkg/Unix/.gdbinit
> > "$BUILD_OUTPUT_DIR/${BUILDTARGET}_$TARGET_TOOLS/$PROCESSOR"
> >fi
> >;;
> >esac
> > @@ -255,7 +255,7 @@ if [[ $HOST_TOOLS == $TARGET_TOOLS ]]; then
> > else
> >build -p $WORKSPACE/EmulatorPkg/EmulatorPkg.dsc $BUILD_OPTIONS -a
> > $PROCESSOR -b $BUILDTARGET -t $HOST_TOOLS
> -D BUILD_$ARCH_SIZE -D UNIX_SEC_BUILD -D SKIP_MAIN_BUILD -n 3 modules
> >build -p $WORKSPACE/EmulatorPkg/EmulatorPkg.dsc $BUILD_OPTIONS -a
> > $PROCESSOR -b $BUILDTARGET -t
> $TARGET_TOOLS -D BUILD_$ARCH_SIZE $NETWORK_SUPPORT $BUILD_NEW_SHELL
> $BUILD_FAT -n 3
> > - cp $BUILD_OUTPUT_DIR/DEBUG_"$HOST_TOOLS"/$PROCESSOR/Host $BUILD_ROOT_ARCH
> > + cp "$BUILD_OUTPUT_DIR/${BUILDTARGET}_$HOST_TOOLS/$PROCESSOR/Host"
> > $BUILD_ROOT_ARCH
> > fi
> > exit $?
> >
> > --
> > 2.20.1
> >
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#43698): https://edk2.groups.io/g/devel/message/43698
Mute This Topic: https://groups.io/mt/31017060/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH 3/3] BaseTools: add GetMaintainer.py script
On Sat, Jul 13, 2019 at 12:58:18AM +0200, Laszlo Ersek wrote: > On 07/12/19 19:01, Leif Lindholm wrote: > > Add a new script GetMaintainer.py that uses the new Maintainer.txt format > > to determine which addresses to cc on patch submission. > > > > Signed-off-by: Leif Lindholm > > Reviewed-by: Philippe Mathieu-Daude > > Tested-by: Philippe Mathieu-Daude > > --- > > BaseTools/Scripts/GetMaintainer.py | 190 + > > 1 file changed, 190 insertions(+) > > create mode 100644 BaseTools/Scripts/GetMaintainer.py > > I should really re-review this from zero, but it's 0:55 AM again. :/ > > Anyway, I think this script is a good candidate for gradual improvements > (should such ever become necessary, that is). The script doesn't have to > be perfect to be incredibly useful. > > Acked-by: Laszlo Ersek Thanks! > ... Did you have me in mind for the ArmVirtPkg and OvmfPkg pathname > patterns, for replacing the natural language pointers? :) That would be ideal, thanks. I might miss something if I did it. I would be happy to push them together with 1-2/3 once ready. Best Regards, Leif -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#43696): https://edk2.groups.io/g/devel/message/43696 Mute This Topic: https://groups.io/mt/32444053/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [PATCH] EmulatorPkg/Unix: Convert timezone from seconds to minutes
Fixes and assert seen when running ls under the shell. It appears the assert was added in: commit 99849a906e15ea3a9a0330d69bbae0d21ff49808 ShellPkg/ls: Display the file time in local time. Signed-off-by: Jordan Justen Cc: Andrew Fish Cc: Ray Ni --- For reference: https://linux.die.net/man/3/timezone EmulatorPkg/Unix/Host/EmuThunk.c| 2 +- EmulatorPkg/Unix/Host/PosixFileSystem.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/EmulatorPkg/Unix/Host/EmuThunk.c b/EmulatorPkg/Unix/Host/EmuThunk.c index f1330c8234..665477e223 100644 --- a/EmulatorPkg/Unix/Host/EmuThunk.c +++ b/EmulatorPkg/Unix/Host/EmuThunk.c @@ -363,7 +363,7 @@ SecGetTime ( Time->Minute = tm->tm_min; Time->Second = tm->tm_sec; Time->Nanosecond = 0; - Time->TimeZone = timezone; + Time->TimeZone = timezone / 60; Time->Daylight = (daylight ? EFI_TIME_ADJUST_DAYLIGHT : 0) | (tm->tm_isdst > 0 ? EFI_TIME_IN_DAYLIGHT : 0); diff --git a/EmulatorPkg/Unix/Host/PosixFileSystem.c b/EmulatorPkg/Unix/Host/PosixFileSystem.c index 3149c6c3e0..5b74053498 100644 --- a/EmulatorPkg/Unix/Host/PosixFileSystem.c +++ b/EmulatorPkg/Unix/Host/PosixFileSystem.c @@ -220,7 +220,7 @@ PosixSystemTimeToEfiTime ( Time->Second = tm->tm_sec; Time->Nanosecond = 0; - Time->TimeZone = timezone; + Time->TimeZone = timezone / 60; Time->Daylight = (daylight ? EFI_TIME_ADJUST_DAYLIGHT : 0) | (tm->tm_isdst > 0 ? EFI_TIME_IN_DAYLIGHT : 0); } -- 2.22.0 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#43695): https://edk2.groups.io/g/devel/message/43695 Mute This Topic: https://groups.io/mt/32457224/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] EmulatorPkg: update HOST_TOOLS to xcode5
pushed as 55b9bbf40a1cf9788dd6a7b093851076851fc670 On 2019-06-19 09:57:20, Stephano Cetola wrote: > The last compiler flag change was for Xcode 5.0, not Xcode 3.2. As such > the HOST_TOOLS should be set to XCODE5. > > Also, fix a small typo. > > This fixes bug 447: > > https://bugzilla.tianocore.org/show_bug.cgi?id=447 > > Signed-off-by: Stephano Cetola > --- > EmulatorPkg/build.sh | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/EmulatorPkg/build.sh b/EmulatorPkg/build.sh > index 558b65e88b..c5bf0bd655 100755 > --- a/EmulatorPkg/build.sh > +++ b/EmulatorPkg/build.sh > @@ -60,9 +60,9 @@ case `uname` in > CLANG_VER=$(clang -ccc-host-triple x86_64-pc-win32-macho 2>&1 > >/dev/null) || true > if [[ "$CLANG_VER" == *-ccc-host-triple* ]] > then > -# only older versions of Xcode support -ccc-host-tripe, for newer > versions > +# only older versions of Xcode support -ccc-host-triple, for newer > versions > # it is -target > - HOST_TOOLS=XCODE32 > + HOST_TOOLS=XCODE5 >TARGET_TOOLS=XCODE5 > else >HOST_TOOLS=XCODE32 > -- > 2.17.1 > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#43694): https://edk2.groups.io/g/devel/message/43694 Mute This Topic: https://groups.io/mt/32125628/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] EmulatorPkg/build.sh: Fix missing usage of -b BUILDTARGET parameter
On 2019-04-10 02:07:34, Jordan Justen wrote:
> Signed-off-by: Jordan Justen
> Cc: Andrew Fish
> Cc: Ray Ni
ping
> ---
> EmulatorPkg/build.sh | 10 +-
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/EmulatorPkg/build.sh b/EmulatorPkg/build.sh
> index 89fd26baca..75561c116a 100755
> --- a/EmulatorPkg/build.sh
> +++ b/EmulatorPkg/build.sh
> @@ -1,7 +1,7 @@
> #!/bin/bash
> #
> # Copyright (c) 2008 - 2011, Apple Inc. All rights reserved.
> -# Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.
> +# Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.
> #
> # SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> @@ -188,7 +188,7 @@ do
> done
>
> PLATFORMFILE=$WORKSPACE/EmulatorPkg/EmulatorPkg.dsc
> -BUILD_DIR=$BUILD_OUTPUT_DIR/DEBUG_"$TARGET_TOOLS"
> +BUILD_DIR="$BUILD_OUTPUT_DIR/${BUILDTARGET}_$TARGET_TOOLS"
> BUILD_ROOT_ARCH=$BUILD_DIR/$PROCESSOR
>
> if [[ ! -f `which build` || ! -f `which GenFv` ]];
> @@ -218,11 +218,11 @@ if [[ "$RUN_EMULATOR" == "yes" ]]; then
>then
># only older versions of Xcode support -ccc-host-tripe, for newer
> versions
># it is -target
> -cp $WORKSPACE/EmulatorPkg/Unix/lldbefi.py
> $BUILD_OUTPUT_DIR/DEBUG_"$TARGET_TOOLS"/$PROCESSOR
> +cp $WORKSPACE/EmulatorPkg/Unix/lldbefi.py
> "$BUILD_OUTPUT_DIR/${BUILDTARGET}_$TARGET_TOOLS/$PROCESSOR"
> cd $BUILD_ROOT_ARCH; /usr/bin/lldb --source
> $WORKSPACE/EmulatorPkg/Unix/lldbinit Host
> exit $?
>else
> -cp $WORKSPACE/EmulatorPkg/Unix/.gdbinit
> $BUILD_OUTPUT_DIR/DEBUG_"$TARGET_TOOLS"/$PROCESSOR
> +cp $WORKSPACE/EmulatorPkg/Unix/.gdbinit
> "$BUILD_OUTPUT_DIR/${BUILDTARGET}_$TARGET_TOOLS/$PROCESSOR"
>fi
>;;
>esac
> @@ -255,7 +255,7 @@ if [[ $HOST_TOOLS == $TARGET_TOOLS ]]; then
> else
>build -p $WORKSPACE/EmulatorPkg/EmulatorPkg.dsc $BUILD_OPTIONS -a
> $PROCESSOR -b $BUILDTARGET -t $HOST_TOOLS -D BUILD_$ARCH_SIZE -D
> UNIX_SEC_BUILD -D SKIP_MAIN_BUILD -n 3 modules
>build -p $WORKSPACE/EmulatorPkg/EmulatorPkg.dsc $BUILD_OPTIONS -a
> $PROCESSOR -b $BUILDTARGET -t $TARGET_TOOLS -D BUILD_$ARCH_SIZE
> $NETWORK_SUPPORT $BUILD_NEW_SHELL $BUILD_FAT -n 3
> - cp $BUILD_OUTPUT_DIR/DEBUG_"$HOST_TOOLS"/$PROCESSOR/Host $BUILD_ROOT_ARCH
> + cp "$BUILD_OUTPUT_DIR/${BUILDTARGET}_$HOST_TOOLS/$PROCESSOR/Host"
> $BUILD_ROOT_ARCH
> fi
> exit $?
>
> --
> 2.20.1
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#43693): https://edk2.groups.io/g/devel/message/43693
Mute This Topic: https://groups.io/mt/31017060/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
