also fix license variable
Co-authored-by: Tianling Shen <cnsztl@gmail.com>
Signed-off-by: Otto Moerbeek <otto@drijf.net>
Signed-off-by: Peter van Dijk <peter.van.dijk@powerdns.com>
include $(TOPDIR)/rules.mk
PKG_NAME:=pdns-recursor
include $(TOPDIR)/rules.mk
PKG_NAME:=pdns-recursor
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://downloads.powerdns.com/releases/
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://downloads.powerdns.com/releases/
-PKG_HASH:=4cb8180458ecfb528a3d9a34ba2844b6cd2ed69ca1c461dde24a0ebd66829144
+PKG_HASH:=70a3b0bfde350e94cdb0746b06d06e6d2f3dc0e171be3b12caef9f3c38468ca3
PKG_MAINTAINER:=Peter van Dijk <peter.van.dijk@powerdns.com>
PKG_MAINTAINER:=Peter van Dijk <peter.van.dijk@powerdns.com>
-PKG_LICENCE:=GPL-2.0-only
-PKG_LICENCE_FILES:=COPYING
+PKG_LICENSE:=GPL-2.0-only
+PKG_LICENSE_FILES:=COPYING
PKG_CPE_ID:=cpe:/a:powerdns:recursor
PKG_FIXUP:=autoreconf
PKG_CPE_ID:=cpe:/a:powerdns:recursor
PKG_FIXUP:=autoreconf
+PKG_BUILD_DEPENDS:=rust/host
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/package.mk
+include ../../lang/rust/rust-values.mk
define Package/pdns-recursor
SECTION:=net
define Package/pdns-recursor
SECTION:=net
--enable-reproducible \
--disable-silent-rules
--enable-reproducible \
--disable-silent-rules
+MAKE_VARS += RUSTC_TARGET_ARCH=$(RUSTC_TARGET_ARCH)
+MAKE_VARS += RUST_TARGET=--target=$(RUSTC_TARGET_ARCH)
+
define Package/pdns-recursor/install
$(INSTALL_DIR) $(1)/etc/powerdns
$(INSTALL_CONF) ./files/recursor.conf-dist $(1)/etc/powerdns/
define Package/pdns-recursor/install
$(INSTALL_DIR) $(1)/etc/powerdns
$(INSTALL_CONF) ./files/recursor.conf-dist $(1)/etc/powerdns/
--- a/Makefile.am
+++ b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
-@@ -507,12 +507,6 @@ $(srcdir)/effective_tld_names.dat:
+@@ -527,15 +527,6 @@ $(srcdir)/effective_tld_names.dat:
pubsuffix.cc: $(srcdir)/effective_tld_names.dat
$(AM_V_GEN)./mkpubsuffixcc
-## Config file
pubsuffix.cc: $(srcdir)/effective_tld_names.dat
$(AM_V_GEN)./mkpubsuffixcc
-## Config file
--sysconf_DATA = recursor.conf-dist
+-sysconf_DATA = recursor.conf-dist recursor.yml-dist
-
-recursor.conf-dist: pdns_recursor
- $(AM_V_GEN)./pdns_recursor --config=default > $@
-
-recursor.conf-dist: pdns_recursor
- $(AM_V_GEN)./pdns_recursor --config=default > $@
+-
+-recursor.yml-dist: pdns_recursor
+- dir=$$(mktemp -d) && touch "$$dir/recursor.yml" && ./pdns_recursor --config-dir="$$dir" --config=default 2> /dev/null > $@ && rm "$$dir/recursor.yml" && rmdir "$$dir"
-
## Manpages
MANPAGES=pdns_recursor.1 \
-
## Manpages
MANPAGES=pdns_recursor.1 \