diff options
-rw-r--r-- | meta/recipes-core/dropbear/dropbear.inc | 12 | ||||
-rw-r--r-- | meta/recipes-core/dropbear/dropbear_2012.55.bb | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc index 2de442c9a3..aa313df316 100644 --- a/meta/recipes-core/dropbear/dropbear.inc +++ b/meta/recipes-core/dropbear/dropbear.inc | |||
@@ -74,10 +74,12 @@ do_install() { | |||
74 | 74 | ||
75 | } | 75 | } |
76 | 76 | ||
77 | pkg_postinst_${PN} () { | 77 | inherit update-alternatives |
78 | update-alternatives --install ${bindir}/scp scp ${sbindir}/dropbearmulti 20 | 78 | |
79 | update-alternatives --install ${bindir}/ssh ssh ${sbindir}/dropbearmulti 20 | 79 | ALTERNATIVE_PRIORITY = "20" |
80 | } | 80 | ALTERNATIVE_${PN} = "scp ssh" |
81 | |||
82 | ALTERNATIVE_TARGET = "${sbindir}/dropbearmulti" | ||
81 | 83 | ||
82 | pkg_postrm_append_${PN} () { | 84 | pkg_postrm_append_${PN} () { |
83 | if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then | 85 | if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then |
@@ -86,6 +88,4 @@ pkg_postrm_append_${PN} () { | |||
86 | if [ -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then | 88 | if [ -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then |
87 | rm ${sysconfdir}/dropbear/dropbear_dss_host_key | 89 | rm ${sysconfdir}/dropbear/dropbear_dss_host_key |
88 | fi | 90 | fi |
89 | update-alternatives --remove ssh ${bindir}/dropbearmulti | ||
90 | update-alternatives --remove scp ${bindir}/dropbearmulti | ||
91 | } | 91 | } |
diff --git a/meta/recipes-core/dropbear/dropbear_2012.55.bb b/meta/recipes-core/dropbear/dropbear_2012.55.bb index 8323a336a3..99163abd00 100644 --- a/meta/recipes-core/dropbear/dropbear_2012.55.bb +++ b/meta/recipes-core/dropbear/dropbear_2012.55.bb | |||
@@ -3,4 +3,5 @@ require dropbear.inc | |||
3 | SRC_URI[md5sum] = "44836e5a0419ba12557f9ea46880077e" | 3 | SRC_URI[md5sum] = "44836e5a0419ba12557f9ea46880077e" |
4 | SRC_URI[sha256sum] = "808df243c61bb60f2f18fa64bca628cbba0918b2a14139f10e6d59d4ac5a17ce" | 4 | SRC_URI[sha256sum] = "808df243c61bb60f2f18fa64bca628cbba0918b2a14139f10e6d59d4ac5a17ce" |
5 | 5 | ||
6 | PR = "${INC_PR}.0" | 6 | PR = "${INC_PR}.1" |
7 | |||