diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-06 00:55:53 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-06 00:55:53 +0000 |
commit | 129b974b59c74140570847bb4a2774d41d1e5fae (patch) | |
tree | f2dc68e7186b8157e33aebbc2526e016912ded82 /debian/patches/0002-avoid-invocations-of-git-during-make-installcheck.patch | |
parent | Adding upstream version 3.2.1. (diff) | |
download | knot-resolver-129b974b59c74140570847bb4a2774d41d1e5fae.tar.xz knot-resolver-129b974b59c74140570847bb4a2774d41d1e5fae.zip |
Adding debian version 3.2.1-3.debian/3.2.1-3
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/0002-avoid-invocations-of-git-during-make-installcheck.patch')
-rw-r--r-- | debian/patches/0002-avoid-invocations-of-git-during-make-installcheck.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/debian/patches/0002-avoid-invocations-of-git-during-make-installcheck.patch b/debian/patches/0002-avoid-invocations-of-git-during-make-installcheck.patch new file mode 100644 index 0000000..01639e5 --- /dev/null +++ b/debian/patches/0002-avoid-invocations-of-git-during-make-installcheck.patch @@ -0,0 +1,33 @@ +From: Daniel Kahn Gillmor <dkg@fifthhorseman.net> +Date: Wed, 12 Sep 2018 09:47:35 -0400 +Subject: avoid invocations of git during "make installcheck" + +The continuous integration test suite was printing a warning to stderr +because of an attempt to invoke git. The debian builds are done from +tarballs, so invoking git wouldn't make sense anyway. +--- + tests/test_integration.mk | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/test_integration.mk b/tests/test_integration.mk +index a5d36c3..9c0768c 100644 +--- a/tests/test_integration.mk ++++ b/tests/test_integration.mk +@@ -4,7 +4,7 @@ + # 1. Run tests from main Deckard repo (generic DNS tests) + # 2. Run tests from kresd repo (kresd-specific tests) + +-SUBMODULES_DIRTY := $(shell git submodule status --recursive | cut -c 1 | grep -q '[^ ]' && echo $$?) ++SUBMODULES_DIRTY := + REAL_PREFIX=$(realpath $(PREFIX)) + REAL_CURDIR=$(realpath $(CURDIR)) + +@@ -12,7 +12,7 @@ REAL_CURDIR=$(realpath $(CURDIR)) + deckard_DIR := $(TOPSRCDIR)/tests/deckard + + $(deckard_DIR)/Makefile: +- @git submodule update --init --recursive ++ touch $@ + + # this is necessary to avoid multiple parallel but independent runs + # of 'make depend' from $(deckard_DIR)/run.sh |