mirror of
https://git.yoctoproject.org/poky
synced 2026-06-09 03:40:18 +00:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
3ec39b83ea
commit
b7a73352f5
@@ -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 \
|
||||
|
||||
Reference in New Issue
Block a user