resolver-conf: fix resolver config for mvebu

Fixes turris/turris-os-packages#580

net/resolver-conf/Makefile

@@ -42,7 +42,7 @@ endef
 
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/etc/config
-ifeq ($(CONFIG_TARGET_mvebu_Turris-Omnia),y)
+ifneq ($(filter-out n,$(CONFIG_PACKAGE_knot-resolver)),)
 	$(INSTALL_CONF) ./files/resolver-omnia-config $(1)/etc/config/resolver
 else
 	$(INSTALL_CONF) ./files/resolver-turris-config $(1)/etc/config/resolver
@@ -56,7 +56,7 @@ endif
 	$(INSTALL_DIR) $(1)/etc/resolver/dns_servers
 	$(INSTALL_DIR) $(1)/usr/share/resolver
 	$(INSTALL_BIN) ./files/resolver-func.sh $(1)/usr/share/resolver/functions.sh
-ifeq ($(CONFIG_TARGET_mvebu),y)
+ifneq ($(filter-out n,$(CONFIG_PACKAGE_knot-resolver)),)
 	$(INSTALL_CONF) ./files/dns_servers/* $(1)/etc/resolver/dns_servers/
 else
 	$(INSTALL_CONF) ./files/dns_servers_turris1x/* $(1)/etc/resolver/dns_servers/

[Karel Koci]

Looking at this, shouldn't logic be modified here? Shouldn't we have default config for unbound and kresd and detect if kresd is available and if not use unbound one?

[Josef Schlehofer]

Sure thing. I thought there is knot-resolver package available for Turris 1.x, but it seems not. Can you check it, now? I changed it as you suggested. I compiled it for Turris Omnia and Turris 1.x. Verified contents of package. It is how it should be.

I was not able to use ifeq ($(CONFIG_PACKAGE_knot-resolver),y), because knot-resolver is not marked as critical package (=Y )

[Karel Koci]

You can probably do:

ifneq ($(filter-out n,$(CONFIG_PACKAGE_knot-resolver)),)

This rather checks if CONFIG_PACKAGE_knot-resolver is not set to empty or n value. Other option would be to use ifeq and filter function to filter y and n. Your's choice.

[Josef Schlehofer]

I was thinking to filter y and n, but it seemed to me like complicated, but your approach seems good in the end. I will change it. Thanks.

[Josef Schlehofer]

Tested for both routers. Unset Knot and set Knot and changes were done correctly.