The ssh and scp symlinks were still being created even when dbclient was
disabled in the build configuration. Fix this annoyance.
Signed-off-by: Rui Salvaterra <rsalvate...@gmail.com>
---
package/network/services/dropbear/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/network/services/dropbear/Makefile
b/package/network/services/dropbear/Makefile
index 61e8a3bcb0..ae3f2a8637 100644
--- a/package/network/services/dropbear/Makefile
+++ b/package/network/services/dropbear/Makefile
@@ -53,9 +53,9 @@ define Package/dropbear
CATEGORY:=Base system
TITLE:=Small SSH2 client/server
DEPENDS:= +DROPBEAR_ZLIB:zlib
- ALTERNATIVES:=\
+ $(if $(CONFIG_DROPBEAR_DBCLIENT),ALTERNATIVES:=\
100:/usr/bin/ssh:/usr/sbin/dropbear \
- 100:/usr/bin/scp:/usr/sbin/dropbear \
+ 100:/usr/bin/scp:/usr/sbin/dropbear,)
endef
@@ -149,7 +149,7 @@ endef
define Build/Compile
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \
- PROGRAMS="dropbear $(if $(CONFIG_DROPBEAR_DBCLIENT),dbclient,)
dropbearkey scp" \
+ PROGRAMS="dropbear $(if $(CONFIG_DROPBEAR_DBCLIENT),dbclient
scp,) dropbearkey" \
MULTI=1 SCPPROGRESS=1
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \
--
2.27.0
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
