Running qemu before building the firmware image doesn't make much sense.
Move things so qemu is run after building OvmfPkg.

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
---
 OvmfPkg/build.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh
index 1c28e65404..a2c4eff2a5 100755
--- a/OvmfPkg/build.sh
+++ b/OvmfPkg/build.sh
@@ -256,6 +256,11 @@ else
   echo using prebuilt tools
 fi
 
+#
+# Build the edk2 OvmfPkg
+#
+echo Running edk2 build for OvmfPkg$Processor
+build -p $PLATFORMFILE $BUILD_OPTIONS -b $BUILDTARGET -t $TARGET_TOOLS -n $THREADNUMBER
 
 if [[ "$RUN_QEMU" == "yes" ]]; then
   if [[ ! -d $QEMU_FIRMWARE_DIR ]]; then
@@ -275,10 +280,4 @@ if [[ "$RUN_QEMU" == "yes" ]]; then
   exit $?
 fi
 
-#
-# Build the edk2 OvmfPkg
-#
-echo Running edk2 build for OvmfPkg$Processor
-build -p $PLATFORMFILE $BUILD_OPTIONS -b $BUILDTARGET -t $TARGET_TOOLS -n $THREADNUMBER
 exit $?
-
-- 
2.22.0


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#44274): https://edk2.groups.io/g/devel/message/44274
Mute This Topic: https://groups.io/mt/32579896/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

On 2019-07-23 18:20:31,  wrote:
> Running qemu before building the firmware image doesn't make much sense.
> Move things so qemu is run after building OvmfPkg.
> 
> Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
> ---
>  OvmfPkg/build.sh | 11 +++++------
>  1 file changed, 5 insertions(+), 6 deletions(-)
> 
> diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh
> index 1c28e65404..a2c4eff2a5 100755
> --- a/OvmfPkg/build.sh
> +++ b/OvmfPkg/build.sh
> @@ -256,6 +256,11 @@ else
>    echo using prebuilt tools
>  fi
>  
> +#
> +# Build the edk2 OvmfPkg
> +#
> +echo Running edk2 build for OvmfPkg$Processor
> +build -p $PLATFORMFILE $BUILD_OPTIONS -b $BUILDTARGET -t $TARGET_TOOLS -n $THREADNUMBER
>  
>  if [[ "$RUN_QEMU" == "yes" ]]; then
>    if [[ ! -d $QEMU_FIRMWARE_DIR ]]; then
> @@ -275,10 +280,4 @@ if [[ "$RUN_QEMU" == "yes" ]]; then
>    exit $?

We exit after running qemu. In other words, if qemu is present on the
command line, then we run qemu, but don't try to build OVMF.

One use case for running qemu multiple times without building is to
preserve non-volatile variables across multiple qemu boots.

-Jordan

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#44282): https://edk2.groups.io/g/devel/message/44282
Mute This Topic: https://groups.io/mt/32579896/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

On 2019-07-23 20:40, Jordan Justen wrote:
>
> We exit after running qemu. In other words, if qemu is present on the
> command line, then we run qemu, but don't try to build OVMF.
>
> One use case for running qemu multiple times without building is to
> preserve non-volatile variables across multiple qemu boots.


Oh! I thought the use case for having qemu in build.sh was to run it
against the newly-built firmware. Since that's not the case, just ignore
this patch.


-- 
Rebecca Cran


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#44333): https://edk2.groups.io/g/devel/message/44333
Mute This Topic: https://groups.io/mt/32579896/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-