Patchwork [CONSOLIDATED,PULL,25/43] dropbear: Use update-alternatives class

login
register
mail settings
Submitter Saul Wold
Date April 20, 2012, 4:45 p.m.
Message ID <7fa077a82fd38bb69407dbbef24f0833f1a05ec1.1334940120.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/26205/
State New
Headers show

Comments

Saul Wold - April 20, 2012, 4:45 p.m.
From: Mark Hatle <mark.hatle@windriver.com>

Use the MANUAL_ALTERNATIVE_LINKS to specify the update-alternatives
so that runtime provides are automatically added to packages.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
 meta/recipes-core/dropbear/dropbear.inc        |    4 ++++
 meta/recipes-core/dropbear/dropbear_2012.55.bb |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

Patch

diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index 2d6aeb2..27a3b66 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -72,6 +72,10 @@  do_install() {
 
 }
 
+inherit update-alternatives
+
+MANUAL_ALTERNATIVE_LINKS = "${bindir}/scp:${sbindir}/dropbearmulti ${bindir}/ssh:${sbindir}/dropbearmulti"
+
 pkg_postinst_${PN} () {
 	update-alternatives --install ${bindir}/scp scp ${sbindir}/dropbearmulti 20
 	update-alternatives --install ${bindir}/ssh ssh ${sbindir}/dropbearmulti 20
diff --git a/meta/recipes-core/dropbear/dropbear_2012.55.bb b/meta/recipes-core/dropbear/dropbear_2012.55.bb
index 4f0ef80..18fea01 100644
--- a/meta/recipes-core/dropbear/dropbear_2012.55.bb
+++ b/meta/recipes-core/dropbear/dropbear_2012.55.bb
@@ -3,4 +3,4 @@  require dropbear.inc
 SRC_URI[md5sum] = "44836e5a0419ba12557f9ea46880077e"
 SRC_URI[sha256sum] = "808df243c61bb60f2f18fa64bca628cbba0918b2a14139f10e6d59d4ac5a17ce"
 
-PR = "r0"
+PR = "r1"