From 6968e17ae5992fd7948098e5d5221a3e106e3452 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 19 Dec 2024 14:11:51 +0000 Subject: 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: 3171dd16ec1a4a7461d29107b8c4bd29ff9acf42) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- 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 3886a5771a..93ecc3f0d6 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" -- cgit v1.2.3-54-g00ecf