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.
Signed-off-by: Ross Burton <ross.bur...@arm.com>
---
meta/recipes-devtools/expect/expect_5.45.4.bb | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-devtools/expect/expect_5.45.4.bb
b/meta/recipes-devtools/expect/expect_5.45.4.bb
index 3886a5771a2..93ecc3f0d69 100644
--- a/meta/recipes-devtools/expect/expect_5.45.4.bb
+++ b/meta/recipes-devtools/expect/expect_5.45.4.bb
@@ -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"
--
2.43.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#208916):
https://lists.openembedded.org/g/openembedded-core/message/208916
Mute This Topic: https://lists.openembedded.org/mt/110197928/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
