| Message ID | 20170830225809.3429-1-rosenp@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [LEDE-DEV] dropbear: Link ssh and scp command to /bin instead of /usr/bin | expand |
This patch has been applied as commit f7528ed0a8 and I think that it has broken dropbear compilation (and naturally also phase1 buildbot) The files are installed into /bin but that directory has not been created with INSTALL_DIR first. That was forgotten from the patch... My own build (after dirclean) produced this: ln -sf ../sbin/dropbear /OwrtLEDE/r7800/build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/dropbear-2017.75/.pkgdir/dropbear/bin/scp ln: failed to create symbolic link '/OwrtLEDE/r7800/build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/dropbear-2017.75/.pkgdir/dropbear/bin/scp': No such file or directory Makefile:147: recipe for target '/OwrtLEDE/r7800/build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/dropbear-2017.75/.pkgdir/dropbear.installed' failed from buildbot: ln -sf ../sbin/dropbear /home/buildbot/slave-lede-local/octeon_generic/build/build_dir/target-mips64_octeon_64_musl/dropbear-2017.75/.pkgdir/dropbear/bin/scp ln: failed to create symbolic link `/home/buildbot/slave-lede-local/octeon_generic/build/build_dir/target-mips64_octeon_64_musl/dropbear-2017.75/.pkgdir/dropbear/bin/scp': No such file or directory make[2]: *** [/home/buildbot/slave-lede-local/octeon_generic/build/build_dir/target-mips64_octeon_64_musl/dropbear-2017.75/.pkgdir/dropbear.installed] Error 1
diff --git a/package/network/services/dropbear/Makefile b/package/network/services/dropbear/Makefile index 7302db273c..95852baf77 100644 --- a/package/network/services/dropbear/Makefile +++ b/package/network/services/dropbear/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dropbear PKG_VERSION:=2017.75 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:= \ @@ -126,8 +126,8 @@ define Package/dropbear/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/dropbearmulti $(1)/usr/sbin/dropbear $(INSTALL_DIR) $(1)/usr/bin - $(LN) ../sbin/dropbear $(1)/usr/bin/scp - $(LN) ../sbin/dropbear $(1)/usr/bin/ssh + $(LN) ../sbin/dropbear $(1)/bin/scp + $(LN) ../sbin/dropbear $(1)/bin/ssh $(LN) ../sbin/dropbear $(1)/usr/bin/dbclient $(LN) ../sbin/dropbear $(1)/usr/bin/dropbearkey $(INSTALL_DIR) $(1)/etc/config
ssh and scp commands interfere with OpenSSH when installed in /usr/bin . One use case is when installing dropbear to get root access when only OpenSSH is available (OpenSSH disallows root password logins). Once dropbear installs, it replaces OpenSSH's executables, even when removed with opkg. OpenSSH must be reinstalled to get them back. Signed-off-by: Rosen Penev <rosenp@gmail.com --- package/network/services/dropbear/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)