[oe-commits] [openembedded-core] 07/28: expect: use u-a for mkpasswd

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit b12cdaf877bc6df71d19a6bbe8c4098d48dea269
Author: Martin Jansa <martin.jansa at gmail.com>
AuthorDate: Sat Jun 17 19:45:30 2017 +0200

    expect: use u-a for mkpasswd
    
    * when busybox is built with CONFIG_CRYPTPW=y, then it will provide
      alternative for mkpasswd, which will fail in postinst, because
      mkpasswd from expect wasn't using u-a:
      update-alternatives: Error: not linking rootfs/usr/bin/mkpasswd to
      /bin/busybox.nosuid since rootfs/usr/bin/mkpasswd exists and is not
      a link
    
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/recipes-devtools/expect/expect_5.45.bb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/expect/expect_5.45.bb b/meta/recipes-devtools/expect/expect_5.45.bb
index 630f2e4..e2d24e8 100644
--- a/meta/recipes-devtools/expect/expect_5.45.bb
+++ b/meta/recipes-devtools/expect/expect_5.45.bb
@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://license.terms;md5=fbf2de7e9102505b1439db06fc36ce5c"
 DEPENDS += "tcl"
 RDEPENDS_${PN} = "tcl"
 
-inherit autotools
+inherit autotools update-alternatives
 
 PR = "r1"
 
@@ -57,6 +57,11 @@ EXTRA_OECONF += "--with-tcl=${STAGING_LIBDIR} \
                 "
 EXTRA_OEMAKE_install = " 'SCRIPTS=' "
 
+ALTERNATIVE_${PN}  = "mkpasswd"
+ALTERNATIVE_LINK_NAME[mkpasswd] = "${bindir}/mkpasswd"
+# Use lower priority than busybox's mkpasswd (created when built with CONFIG_CRYPTPW)
+ALTERNATIVE_PRIORITY[mkpasswd] = "40"
+
 FILES_${PN}-dev = "${libdir_native}/expect${PV}/libexpect*.so \
                    ${includedir}/expect.h \
                    ${includedir}/expect_tcl.h \

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.