summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2017-06-17 19:45:30 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-28 20:55:08 +0100
commitb7a73352f510bcf429467820c513b75960758483 (patch)
treecaaf03787f4c20c515f28a909c40fe010b2dc716 /meta
parent3ec39b83eaa14ede81458859dcae59bca89cbbec (diff)
downloadpoky-b7a73352f510bcf429467820c513b75960758483.tar.gz
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 (From OE-Core rev: b12cdaf877bc6df71d19a6bbe8c4098d48dea269) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/expect/expect_5.45.bb7
1 files changed, 6 insertions, 1 deletions
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"
16DEPENDS += "tcl" 16DEPENDS += "tcl"
17RDEPENDS_${PN} = "tcl" 17RDEPENDS_${PN} = "tcl"
18 18
19inherit autotools 19inherit autotools update-alternatives
20 20
21PR = "r1" 21PR = "r1"
22 22
@@ -57,6 +57,11 @@ EXTRA_OECONF += "--with-tcl=${STAGING_LIBDIR} \
57 " 57 "
58EXTRA_OEMAKE_install = " 'SCRIPTS=' " 58EXTRA_OEMAKE_install = " 'SCRIPTS=' "
59 59
60ALTERNATIVE_${PN} = "mkpasswd"
61ALTERNATIVE_LINK_NAME[mkpasswd] = "${bindir}/mkpasswd"
62# Use lower priority than busybox's mkpasswd (created when built with CONFIG_CRYPTPW)
63ALTERNATIVE_PRIORITY[mkpasswd] = "40"
64
60FILES_${PN}-dev = "${libdir_native}/expect${PV}/libexpect*.so \ 65FILES_${PN}-dev = "${libdir_native}/expect${PV}/libexpect*.so \
61 ${includedir}/expect.h \ 66 ${includedir}/expect.h \
62 ${includedir}/expect_tcl.h \ 67 ${includedir}/expect_tcl.h \