mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 05:09:24 +00:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
71fbb20771
commit
a18b799d67
@@ -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}"
|
||||
|
||||
Reference in New Issue
Block a user