diff mbox series

[04/11] edk2: .git can be a file

Message ID 20220308145521.3106395-5-kraxel@redhat.com (mailing list archive)
State New, archived
Headers show
Series edk2: update to stable202202 | expand

Commit Message

Gerd Hoffmann March 8, 2022, 2:55 p.m. UTC
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 roms/Makefile.edk2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Eric Blake March 8, 2022, 10:56 p.m. UTC | #1
On Tue, Mar 08, 2022 at 03:55:14PM +0100, Gerd Hoffmann wrote:
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  roms/Makefile.edk2 | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/roms/Makefile.edk2 b/roms/Makefile.edk2
> index 3d75a842a4df..a669019fe5b2 100644
> --- a/roms/Makefile.edk2
> +++ b/roms/Makefile.edk2
> @@ -51,7 +51,7 @@ all: $(foreach flashdev,$(flashdevs),../pc-bios/edk2-$(flashdev).fd.bz2) \
>  # we're building from a tarball and that they've already been fetched by
>  # make-release/tarball scripts.
>  submodules:
> -	if test -d edk2/.git; then \
> +	if test -d edk2/.git -o -f edk2/.git; then \

'test ... -o ...' is not portable.  Either write this as:

if test -d edk2/.git || test -f edk2/.git; then \

or go with the shorter:

if test -e edk2/.git; then \

>  		cd edk2 && git submodule update --init --force -- \
>  			ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 \
>  			BaseTools/Source/C/BrotliCompress/brotli \
> -- 
> 2.35.1
> 
>
diff mbox series

Patch

diff --git a/roms/Makefile.edk2 b/roms/Makefile.edk2
index 3d75a842a4df..a669019fe5b2 100644
--- a/roms/Makefile.edk2
+++ b/roms/Makefile.edk2
@@ -51,7 +51,7 @@  all: $(foreach flashdev,$(flashdevs),../pc-bios/edk2-$(flashdev).fd.bz2) \
 # we're building from a tarball and that they've already been fetched by
 # make-release/tarball scripts.
 submodules:
-	if test -d edk2/.git; then \
+	if test -d edk2/.git -o -f edk2/.git; then \
 		cd edk2 && git submodule update --init --force -- \
 			ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 \
 			BaseTools/Source/C/BrotliCompress/brotli \