summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2019-08-23 20:51:42 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-07 06:47:24 (GMT)
commita18b799d67e54b091b369d4325d73a8abeccef34 (patch)
tree01de4d604389549b3e5e96da926aeb12a98cbf32 /meta/recipes-core
parent71fbb2077124c18f2ae2d26b07869c5a29a55edb (diff)
downloadpoky-a18b799d67e54b091b369d4325d73a8abeccef34.tar.gz
dropbear: don't create invalid symlinks if ssh, scp, etc are disabled
(From OE-Core rev: 703e3faaec8c5a22fe3bc9a2a040c960862136c7) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/dropbear/dropbear.inc11
1 files changed, 9 insertions, 2 deletions
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index dcbda74..7269888 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -70,8 +70,13 @@ do_install() {
70 install -m 0644 ${WORKDIR}/dropbear.default ${D}${sysconfdir}/default/dropbear 70 install -m 0644 ${WORKDIR}/dropbear.default ${D}${sysconfdir}/default/dropbear
71 71
72 install -m 0755 dropbearmulti ${D}${sbindir}/ 72 install -m 0755 dropbearmulti ${D}${sbindir}/
73 ln -s ${sbindir}/dropbearmulti ${D}${bindir}/dbclient
74 73
74 for i in ${BINCOMMANDS}
75 do
76 # ssh and scp symlinks are created by update-alternatives
77 if [ $i = ssh ] || [ $i = scp ]; then continue; fi
78 ln -s ${sbindir}/dropbearmulti ${D}${bindir}/$i
79 done
75 for i in ${SBINCOMMANDS} 80 for i in ${SBINCOMMANDS}
76 do 81 do
77 ln -s ./dropbearmulti ${D}${sbindir}/$i 82 ln -s ./dropbearmulti ${D}${sbindir}/$i
@@ -101,7 +106,7 @@ do_install() {
101inherit update-alternatives 106inherit update-alternatives
102 107
103ALTERNATIVE_PRIORITY = "20" 108ALTERNATIVE_PRIORITY = "20"
104ALTERNATIVE_${PN} = "scp ssh" 109ALTERNATIVE_${PN} = "${@bb.utils.filter('BINCOMMANDS', 'scp ssh', d)}"
105 110
106ALTERNATIVE_TARGET = "${sbindir}/dropbearmulti" 111ALTERNATIVE_TARGET = "${sbindir}/dropbearmulti"
107 112
@@ -113,3 +118,5 @@ pkg_postrm_append_${PN} () {
113 rm ${sysconfdir}/dropbear/dropbear_dss_host_key 118 rm ${sysconfdir}/dropbear/dropbear_dss_host_key
114 fi 119 fi
115} 120}
121
122FILES_${PN} += "${bindir}"