mirror of
https://git.yoctoproject.org/git/poky
synced 2026-01-01 13:58:04 +00:00
expect: cleanup do_install
Clean up the do_install append, and remove a long-standing unused variable that appears to be intending to not install the scripts but would have never actually done that as the relevant override since 2008 has been task-install. As we've been installing the scripts, keep instaling them. (From OE-Core rev: 10a501b3bfe8f73ce2eb15673900df71e547b54d) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
parent
e49d690cf1
commit
b95695a302
|
|
@ -42,11 +42,9 @@ S = "${WORKDIR}/${BPN}${PV}"
|
|||
EXTRA_AUTORECONF += "--exclude=aclocal"
|
||||
|
||||
do_install:append() {
|
||||
install -d ${D}${libdir}
|
||||
install -m 0755 ${D}${libdir}/expect${PV}/libexpect*.so ${D}${libdir}/
|
||||
install -m 0755 ${S}/fixline1 ${D}${libdir}/expect${PV}/
|
||||
rm ${D}${libdir}/expect${PV}/libexpect*.so
|
||||
sed -e 's|$dir|${libdir}|' -i ${D}${libdir}/expect${PV}/pkgIndex.tcl
|
||||
mv ${D}${libdir}/expect${PV}/libexpect*.so ${D}${libdir}/
|
||||
install -m 0755 ${S}/fixline1 ${D}${libdir}/expect${PV}/
|
||||
sed -e 's|$dir|${libdir}|' -i ${D}${libdir}/expect${PV}/pkgIndex.tcl
|
||||
}
|
||||
|
||||
do_install_ptest() {
|
||||
|
|
@ -65,7 +63,6 @@ EXTRA_OECONF += "--with-tcl=${STAGING_LIBDIR} \
|
|||
--disable-rpath \
|
||||
${TCL_INCLUDE_PATH} \
|
||||
"
|
||||
EXTRA_OEMAKE_install = " 'SCRIPTS=' "
|
||||
|
||||
ALTERNATIVE:${PN} = "mkpasswd"
|
||||
ALTERNATIVE_LINK_NAME[mkpasswd] = "${bindir}/mkpasswd"
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user