From 8544018093b8aa4311b1e970f8396140c22ede0b Mon Sep 17 00:00:00 2001

From: Luca Boccassi <bluca@debian.org>

Date: Mon, 14 Jan 2019 19:29:34 +0000

Subject: [PATCH 17/62] Makefile: do not run git on clean if there's no .git

 directory

When building in minimal chroot on build workers, like in Debian (where

make clean is called at the beginning of the build process), git will

not be available. Skip the git clean.

Signed-off-by: Luca Boccassi <bluca@debian.org>

Upstream-commit-id: be352762a01

---

 Makefile | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile

index 3f2105595a6..fd7e83dc764 100644

--- a/Makefile

+++ b/Makefile

@@ -225,7 +225,7 @@ clean-shim-objs:

 	@rm -rvf $(TARGET) *.o $(SHIM_OBJS) $(MOK_OBJS) $(FALLBACK_OBJS) $(KEYS) certdb $(BOOTCSVNAME)

 	@rm -vf *.debug *.so *.efi *.efi.* *.tar.* version.c buildid

 	@rm -vf Cryptlib/*.[oa] Cryptlib/*/*.[oa]

-	@git clean -f -d -e 'Cryptlib/OpenSSL/*'

+	@if [ -d .git ] ; then git clean -f -d -e 'Cryptlib/OpenSSL/*'; fi

 clean: clean-shim-objs

 	$(MAKE) -C Cryptlib -f $(TOPDIR)/Cryptlib/Makefile clean

-- 

2.26.2