summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-09-13 10:28:23 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-09-13 10:28:23 +0000
commit70e565f1f3748c0bbfbbaeda8ea035189830e64a (patch)
treec62e17346899589d0ae3c4e2704669d9ab192ee2
parentReleasing progress-linux version 3.0.0-5~dschinn1. (diff)
downloadknot-resolver-70e565f1f3748c0bbfbbaeda8ea035189830e64a.zip
knot-resolver-70e565f1f3748c0bbfbbaeda8ea035189830e64a.tar.xz
Merging debian version 3.0.0-6.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog6
-rw-r--r--debian/control2
-rwxr-xr-xdebian/rules10
3 files changed, 17 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 5fbccc7..8319a3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+knot-resolver (3.0.0-6) unstable; urgency=medium
+
+ * stop building knot-resolver on arm64 (Closes: #907729)
+
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net> Wed, 05 Sep 2018 19:30:10 -0400
+
knot-resolver (3.0.0-5~dschinn1) dschinn-backports; urgency=medium
* Uploading to dschinn-backports, remaining changes:
diff --git a/debian/control b/debian/control
index 67cec2f..29553e6 100644
--- a/debian/control
+++ b/debian/control
@@ -39,6 +39,7 @@ XSBC-Original-Vcs-Git: https://salsa.debian.org/dns-team/knot-resolver.git
Rules-Requires-Root: no
Package: knot-resolver
+# actually "Architecture: any [!arm64]" via debian/rules, see #907729
Architecture: any
Depends:
adduser,
@@ -68,6 +69,7 @@ Description: caching, DNSSEC-validating DNS resolver
nodes depending on the contention without downtime.
Package: knot-resolver-module-http
+# actually "Architecture: any [!arm64]" via debian/rules, see #907729
Architecture: all
Depends:
libjs-bootstrap,
diff --git a/debian/rules b/debian/rules
index 87831d0..13912d1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,8 +18,14 @@ export PREFIX=/usr
export MODULEDIR=/usr/lib/knot-resolver
export ETCDIR=/etc/knot-resolver
+# see https://bugs.debian.org/907729
+LUA_LUD_BROKEN_ARCHES := arm64
+ifneq (, $(filter $(DEB_HOST_ARCH), $(LUA_LUD_BROKEN_ARCHES)))
+ KRESD_EXCLUDE_ARCHES := -Nknot-resolver -Nknot-resolver-module-http
+endif
+
%:
- dh $@
+ dh $@ $(KRESD_EXCLUDE_ARCHES)
override_dh_auto_clean-indep:
dh_auto_clean -- doc-clean http-clean
@@ -53,9 +59,11 @@ override_dh_auto_test-indep:
override_dh_auto_test-arch:
dh_auto_test -- V=1
ifeq (, $(filter nocheck, $(DEB_BUILD_OPTIONS)))
+ifeq (, $(filter $(DEB_HOST_ARCH), $(LUA_LUD_BROKEN_ARCHES)))
mkdir -p test-modules && (cd test-modules && ln -sf ../modules/*/*.lua ../modules/*/*.so ../modules/policy/lua-aho-corasick/*.lua ../modules/policy/lua-aho-corasick/*.so ../daemon/lua/* ./)
MODULE_DIR=$(CURDIR)/test-modules LD_LIBRARY_PATH=$(CURDIR)/lib KRESD=$(CURDIR)/daemon/kresd debian/tests/roundtrip
endif
+endif
override_dh_missing:
dh_missing --fail-missing