From b12cdaf877bc6df71d19a6bbe8c4098d48dea269 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 17 Jun 2017 19:45:30 +0200 Subject: 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 Signed-off-by: Ross Burton --- meta/recipes-devtools/expect/expect_5.45.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'meta/recipes-devtools/expect') diff --git a/meta/recipes-devtools/expect/expect_5.45.bb b/meta/recipes-devtools/expect/expect_5.45.bb index 630f2e4649..e2d24e8d85 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 \ -- cgit 1.2.3-korg