distro: remove etcd module due to missing dependency

diff --git a/distro/arch/PKGBUILD b/distro/arch/PKGBUILD
index 7a6c2ecde957106e6fc757772a36908e2364c991..6c00ed5095092d936c81f62cf97cc621306e47fe 100644 (file)
--- a/distro/arch/PKGBUILD
+++ b/distro/arch/PKGBUILD
@@ -62,4 +62,7 @@ package() {
     # add kresd.target to multi-user.target.wants to support enabling kresd services
     install -dm 0755 "${pkgdir}/usr/lib/systemd/system/multi-user.target.wants"
     ln -s ../kresd.target "${pkgdir}/usr/lib/systemd/system/multi-user.target.wants/kresd.target"
+
+    # remove modules with missing dependencies
+    rm "${pkgdir}/usr/lib/knot-resolver/kres_modules/etcd.lua"
 }

diff --git a/distro/deb/knot-resolver.install b/distro/deb/knot-resolver.install
index 6ecd7a28ae4e5a8c2a8c6416396e98cf9317d994..7831166066b5ec6039dcdf6b84aa4bc6e861e02d 100644 (file)
--- a/distro/deb/knot-resolver.install
+++ b/distro/deb/knot-resolver.install
@@ -9,7 +9,6 @@ usr/lib/knot-resolver/kres_modules/daf/*
 usr/lib/knot-resolver/kres_modules/detect_time_jump.lua
 usr/lib/knot-resolver/kres_modules/detect_time_skew.lua
 usr/lib/knot-resolver/kres_modules/dns64.lua
-usr/lib/knot-resolver/kres_modules/etcd.lua
 usr/lib/knot-resolver/kres_modules/experimental_dot_auth.lua
 usr/lib/knot-resolver/kres_modules/graphite.lua
 usr/lib/knot-resolver/kres_modules/policy.lua

diff --git a/distro/deb/not-installed b/distro/deb/not-installed
index 141cce6c58b7b5759085d21280bfac81f92a133c..ee9c1044b4a20c598af9922b912bfeab67941c29 100644 (file)
--- a/distro/deb/not-installed
+++ b/distro/deb/not-installed
@@ -1,2 +1,3 @@
 usr/lib/knot-resolver/kres_modules/http/LICENSE
+usr/lib/knot-resolver/kres_modules/etcd.lua
 debian/tmp/usr/share/doc/knot-resolver/html/.buildinfo

diff --git a/distro/rpm/knot-resolver.spec b/distro/rpm/knot-resolver.spec
index 656491b6454464b601181c59fb32e4df1d499928..92078e813e90d47cab9c1f4b779be62586eedd8c 100644 (file)
--- a/distro/rpm/knot-resolver.spec
+++ b/distro/rpm/knot-resolver.spec
@@ -159,11 +159,12 @@ ln -s ../kresd.target %{buildroot}%{_unitdir}/multi-user.target.wants/kresd.targ
 install -m 0750 -d %{buildroot}%{_localstatedir}/cache/%{name}
 install -m 0750 -d %{buildroot}/run/%{name}
 
-# remove http module (missing dependencies)
+# remove modules with missing dependencies
+rm %{buildroot}%{_libdir}/knot-resolver/kres_modules/etcd.lua
 rm -r %{buildroot}%{_libdir}/knot-resolver/kres_modules/http
-rm -r %{buildroot}%{_libdir}/knot-resolver/kres_modules/http.lua
-rm -r %{buildroot}%{_libdir}/knot-resolver/kres_modules/http_trace.lua
-rm -r %{buildroot}%{_libdir}/knot-resolver/kres_modules/prometheus.lua
+rm %{buildroot}%{_libdir}/knot-resolver/kres_modules/http.lua
+rm %{buildroot}%{_libdir}/knot-resolver/kres_modules/http_trace.lua
+rm %{buildroot}%{_libdir}/knot-resolver/kres_modules/prometheus.lua
 
 # rename doc directory for centos, opensuse
 %if "x%{?fedora}" == "x"