From 81654c6570d425338029f66e425670e1ca720982 Mon Sep 17 00:00:00 2001 From: Christopher Ng Date: Wed, 1 May 2024 13:10:35 +0100 Subject: [PATCH] knot: fix EXTRA_DEPENDS for APK version schema EXTRA_DEPENDS now requires an `r` before the `PKG_RELEASE` because of https://github.com/openwrt/openwrt/commit/e8725a932e16eaf6ec51add8c084d959cbe32ff2. Fixes https://github.com/openwrt/packages/issues/23735 Signed-off-by: Christopher Ng --- net/knot/Makefile | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/net/knot/Makefile b/net/knot/Makefile index e532952f00..d2d00c13c1 100644 --- a/net/knot/Makefile +++ b/net/knot/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=knot PKG_VERSION:=3.3.6 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://secure.nic.cz/files/knot-dns/ @@ -57,8 +57,8 @@ define Package/knot $(call Package/knot/Default) TITLE+= server with control utility DEPENDS+=+libedit +liburcu +knot-libs +knot-libzscanner - EXTRA_DEPENDS:=knot-libs (=$(PKG_VERSION)-$(PKG_RELEASE)), \ - knot-libzscanner (=$(PKG_VERSION)-$(PKG_RELEASE)) + EXTRA_DEPENDS:=knot-libs (=$(PKG_VERSION)-r$(PKG_RELEASE)), \ + knot-libzscanner (=$(PKG_VERSION)-r$(PKG_RELEASE)) USERID:=knot=5353:knot=5353 endef @@ -66,46 +66,46 @@ define Package/knot-dig $(call Package/knot/Default) TITLE+= advanced DNS lookup utility DEPENDS+=+libedit +knot-libs - EXTRA_DEPENDS:=knot-libs (=$(PKG_VERSION)-$(PKG_RELEASE)) + EXTRA_DEPENDS:=knot-libs (=$(PKG_VERSION)-r$(PKG_RELEASE)) endef define Package/knot-host $(call Package/knot/Default) TITLE+= simple DNS lookup utility DEPENDS+=+libedit +knot-libs - EXTRA_DEPENDS:=knot-libs (=$(PKG_VERSION)-$(PKG_RELEASE)) + EXTRA_DEPENDS:=knot-libs (=$(PKG_VERSION)-r$(PKG_RELEASE)) endef define Package/knot-nsupdate $(call Package/knot/Default) TITLE+= dynamic DNS update utility DEPENDS+=+libedit +knot-libs +knot-libzscanner - EXTRA_DEPENDS:=knot-libs (=$(PKG_VERSION)-$(PKG_RELEASE)), \ - knot-libzscanner (=$(PKG_VERSION)-$(PKG_RELEASE)) + EXTRA_DEPENDS:=knot-libs (=$(PKG_VERSION)-r$(PKG_RELEASE)), \ + knot-libzscanner (=$(PKG_VERSION)-r$(PKG_RELEASE)) endef define Package/knot-zonecheck $(call Package/knot/Default) TITLE+= zonefile check utility DEPENDS+=+libedit +liburcu +knot-libs +knot-libzscanner - EXTRA_DEPENDS:=knot-libs (=$(PKG_VERSION)-$(PKG_RELEASE)), \ - knot-libzscanner (=$(PKG_VERSION)-$(PKG_RELEASE)) + EXTRA_DEPENDS:=knot-libs (=$(PKG_VERSION)-r$(PKG_RELEASE)), \ + knot-libzscanner (=$(PKG_VERSION)-r$(PKG_RELEASE)) endef define Package/knot-keymgr $(call Package/knot/Default) TITLE+= DNSSEC key management utility DEPENDS+=+libedit +liburcu +knot-libs +knot-libzscanner - EXTRA_DEPENDS:=knot-libs (=$(PKG_VERSION)-$(PKG_RELEASE)), \ - knot-libzscanner (=$(PKG_VERSION)-$(PKG_RELEASE)) + EXTRA_DEPENDS:=knot-libs (=$(PKG_VERSION)-r$(PKG_RELEASE)), \ + knot-libzscanner (=$(PKG_VERSION)-r$(PKG_RELEASE)) endef define Package/knot-tests $(call Package/knot/Default) TITLE+= tests DEPENDS+=+libedit +liburcu +knot-libs +knot-libzscanner - EXTRA_DEPENDS:=knot-libs (=$(PKG_VERSION)-$(PKG_RELEASE)), \ - knot-libzscanner (=$(PKG_VERSION)-$(PKG_RELEASE)) + EXTRA_DEPENDS:=knot-libs (=$(PKG_VERSION)-r$(PKG_RELEASE)), \ + knot-libzscanner (=$(PKG_VERSION)-r$(PKG_RELEASE)) endef define Package/knot-libs/description -- 2.30.2