From a2a7b689810871d639a47575dc8ed5823792eea4 Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Wed, 6 Mar 2019 12:25:40 +0100 Subject: [PATCH] distro: remove etcd module due to missing dependency --- distro/arch/PKGBUILD | 3 +++ distro/deb/knot-resolver.install | 1 - distro/deb/not-installed | 1 + distro/rpm/knot-resolver.spec | 9 +++++---- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/distro/arch/PKGBUILD b/distro/arch/PKGBUILD index 7a6c2ecde..6c00ed509 100644 --- 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 6ecd7a28a..783116606 100644 --- 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 141cce6c5..ee9c1044b 100644 --- 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 656491b64..92078e813 100644 --- 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" -- 2.47.2