From ad536b8717e068bed101ed8f495e7f7eb93a713d Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Tue, 24 Jul 2018 18:13:48 -0400 Subject: [PATCH] debian/patches/fixup_git.patch: don't run git in clean; we're not really in a git tree. --- debian/changelog | 2 ++ debian/patches/fixup_git.patch | 19 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 22 insertions(+) create mode 100644 debian/patches/fixup_git.patch diff --git a/debian/changelog b/debian/changelog index 5630d81..7253cb1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ shim (15+1531942534.dd3230d-0ubuntu1) UNRELEASED; urgency=medium * debian/rules: - define RELEASE and COMMIT_ID for the snapshot. - Set ENABLE_HTTPBOOT to enable the HTTP Boot feature. + * debian/patches/fixup_git.patch: don't run git in clean; we're not really + in a git tree. -- Mathieu Trudel-Lapierre Tue, 24 Jul 2018 16:24:51 -0400 diff --git a/debian/patches/fixup_git.patch b/debian/patches/fixup_git.patch new file mode 100644 index 0000000..33e9305 --- /dev/null +++ b/debian/patches/fixup_git.patch @@ -0,0 +1,19 @@ +From: Mathieu Trudel-Lapierre +Subject: We're not in a git tree, don't try to git clean. + +--- + Makefile | 1 - + 1 file changed, 1 deletion(-) + +Index: b/Makefile +=================================================================== +--- a/Makefile ++++ b/Makefile +@@ -225,7 +225,6 @@ 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/*' + + clean: clean-shim-objs + $(MAKE) -C Cryptlib -f $(TOPDIR)/Cryptlib/Makefile clean diff --git a/debian/patches/series b/debian/patches/series index e69de29..767bfb5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1 @@ +fixup_git.patch