dropbear: don't create invalid symlinks if ssh, scp, etc are disabled

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index dcbda741c3aad5efee0d3115fc9c97a9226c2d77..7269888a4e191a4c04e7fe935439b99d8b531221 100644 (file)
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -70,8 +70,13 @@ do_install() {
        install -m 0644 ${WORKDIR}/dropbear.default ${D}${sysconfdir}/default/dropbear
 
        install -m 0755 dropbearmulti ${D}${sbindir}/
-       ln -s ${sbindir}/dropbearmulti ${D}${bindir}/dbclient
 
+       for i in ${BINCOMMANDS}
+       do
+               # ssh and scp symlinks are created by update-alternatives
+               if [ $i = ssh ] || [ $i = scp ]; then continue; fi
+               ln -s ${sbindir}/dropbearmulti ${D}${bindir}/$i
+       done
        for i in ${SBINCOMMANDS}
        do
                ln -s ./dropbearmulti ${D}${sbindir}/$i
@@ -101,7 +106,7 @@ do_install() {
 inherit update-alternatives
 
 ALTERNATIVE_PRIORITY = "20"
-ALTERNATIVE_${PN} = "scp ssh"
+ALTERNATIVE_${PN} = "${@bb.utils.filter('BINCOMMANDS', 'scp ssh', d)}"
 
 ALTERNATIVE_TARGET = "${sbindir}/dropbearmulti"
 
@@ -113,3 +118,5 @@ pkg_postrm_append_${PN} () {
         rm ${sysconfdir}/dropbear/dropbear_dss_host_key
   fi
 }
+
+FILES_${PN} += "${bindir}"