openssh: make libfido2 dependency conditional on sk-helper

The openssh-sk-helper package unconditionally depends on libfido2,
which causes the build system to pull in libfido2 and its dependencies
(libcbor, libudev) even when openssh-sk-helper is not selected.

Use the PACKAGE_openssh-sk-helper:libfido2 conditional dependency
pattern so libfido2 is only required when the sk-helper sub-package
is actually selected.

Signed-off-by: Michael Pfeifroth <redacted>

diff --git a/net/openssh/Makefile b/net/openssh/Makefile
index 129349d5137443a7da558040d7b9e5d561e8ad79..46fe0433ad17cc830271e2529d9478a9aded9748 100644 (file)
--- a/net/openssh/Makefile
+++ b/net/openssh/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=openssh
 PKG_REALVERSION:=10.4p1
 PKG_VERSION:=10.4_p1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_REALVERSION).tar.gz
 PKG_SOURCE_URL:=https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
@@ -159,7 +159,7 @@ endef
 
 define Package/openssh-sk-helper
        $(call Package/openssh/Default)
-       DEPENDS+= +libopenssl +zlib +libfido2
+  DEPENDS+= +libopenssl +zlib +PACKAGE_openssh-sk-helper:libfido2
        TITLE+= helper for FIDO U2F and FIDO2 hardware token support
 endef