diff options
| author | Steve McIntyre <93sam@debian.org> | 2021-02-21 15:06:56 +0000 |
|---|---|---|
| committer | Steve McIntyre <93sam@debian.org> | 2021-02-21 16:34:28 +0000 |
| commit | 168d42d09df3c952dae9f0ceedaa55e9b325da5b (patch) | |
| tree | e5ab3900e9ec9b270cdeffb573d43f66ee9fd3cc | |
| parent | e105392d54d0a369a7a6e5f636b62181d9a14d35 (diff) | |
| download | efi-boot-shim-168d42d09df3c952dae9f0ceedaa55e9b325da5b.tar.gz efi-boot-shim-168d42d09df3c952dae9f0ceedaa55e9b325da5b.zip | |
Trivial change to remove bashisms in Make.coverity
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/fix-Make.coverity-bashisms.patch | 26 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 29 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index eaec2988..65af73bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ shim (15+1613861442.888f5b5-1) unstable; urgency=medium - fixup_git.patch - uname.patch - use_compare_mem_gcc9.patch + * New patches: + + Trivial change to remove bashisms in Make.coverity * Switch to using gcc-10 rather than gcc-9. Closes: #978521 -- Steve McIntyre <93sam@debian.org> Sun, 21 Feb 2021 13:50:16 +0100 diff --git a/debian/patches/fix-Make.coverity-bashisms.patch b/debian/patches/fix-Make.coverity-bashisms.patch new file mode 100644 index 00000000..c1cdeb96 --- /dev/null +++ b/debian/patches/fix-Make.coverity-bashisms.patch @@ -0,0 +1,26 @@ +diff --git a/Make.coverity b/Make.coverity +index 996e826e..a897aa0a 100644 +--- a/Make.coverity ++++ b/Make.coverity +@@ -12,7 +12,7 @@ cov-int-all : clean + + cov-clean : + @rm -vf $(NAME)-coverity-*.tar.* +- @if [[ -d cov-int ]]; then rm -rf cov-int && echo "removed 'cov-int'"; fi ++ @if [ -d cov-int ]; then rm -rf cov-int && echo "removed 'cov-int'"; fi + + cov-file : | $(COV_FILE) + +@@ -20,9 +20,9 @@ $(COV_FILE) : | cov-int + tar caf $@ cov-int + + cov-upload : +- @if [[ -n "$(COV_URL)" ]] && \ +- [[ -n "$(COV_TOKEN)" ]] && \ +- [[ -n "$(COV_EMAIL)" ]] ; \ ++ @if [ -n "$(COV_URL)" ] && \ ++ [ -n "$(COV_TOKEN)" ] && \ ++ [ -n "$(COV_EMAIL)" ] ; \ + then \ + echo curl --form token=$(COV_TOKEN) --form email="$(COV_EMAIL)" --form file=@"$(COV_FILE)" --form version=$(VERSION).1 --form description="$(COMMIT_ID)" "$(COV_URL)" ; \ + curl --form token=$(COV_TOKEN) --form email="$(COV_EMAIL)" --form file=@"$(COV_FILE)" --form version=$(VERSION).1 --form description="$(COMMIT_ID)" "$(COV_URL)" ; \ diff --git a/debian/patches/series b/debian/patches/series index e69de29b..30f25719 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1 @@ +fix-Make.coverity-bashisms.patch |