diff options
| author |   Mark Hatle <mark.hatle@windriver.com> | 2012-05-15 18:34:50 -0500 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-30 10:44:52 +0100 |
| commit | e7164da229d8ccccb043a790b25c995a46a83c88 (patch) | |
| tree | c20bcce36fb98bc587f3cf6099a9bf475cab8067 | |
| parent | 4bed7f31535f16dbe1f8bbab58921f12f1696f6f (diff) | |
| download | openembedded-core-contrib-e7164da229d8ccccb043a790b25c995a46a83c88.tar.gz | |
dropbear: use new update-alternatives
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
| -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() { } -pkg_postinst_${PN} () { - update-alternatives --install ${bindir}/scp scp ${sbindir}/dropbearmulti 20 - update-alternatives --install ${bindir}/ssh ssh ${sbindir}/dropbearmulti 20 -} +inherit update-alternatives + +ALTERNATIVE_PRIORITY = "20" +ALTERNATIVE_${PN} = "scp ssh" + +ALTERNATIVE_TARGET = "${sbindir}/dropbearmulti" pkg_postrm_append_${PN} () { if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then @@ -86,6 +88,4 @@ pkg_postrm_append_${PN} () { if [ -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then rm ${sysconfdir}/dropbear/dropbear_dss_host_key fi - update-alternatives --remove ssh ${bindir}/dropbearmulti - update-alternatives --remove scp ${bindir}/dropbearmulti } 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 SRC_URI[md5sum] = "44836e5a0419ba12557f9ea46880077e" SRC_URI[sha256sum] = "808df243c61bb60f2f18fa64bca628cbba0918b2a14139f10e6d59d4ac5a17ce" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" + |