From ccefb1eb89dd914c128d9fb6d49c8c7304ba47c5 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 9 Mar 2018 14:00:05 +0100 Subject: ncurses: fix deletion of /usr/lib/terminfo Ncurses doesn't honour ${libdir} for terminfo, so try more options to remove it. (From OE-Core rev: 17fd322e925cf492b22c75e296d5fee31e3511db) (From OE-Core rev: 3d07d4a1e8a7324437e2f37ffcafbb032a086008) Signed-off-by: Koen Kooi Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- meta/recipes-core/ncurses/ncurses.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index 5bd5c0e58d..8753852719 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc @@ -201,7 +201,10 @@ do_install() { ln -sf xterm-color ${D}${sysconfdir}/terminfo/x/xterm fi - rm -f ${D}${libdir}/terminfo + # When changing ${libdir} to e.g. /usr/lib/myawesomelib/ ncurses + # still installs '/usr/lib/terminfo', so try to rm both + # the proper path and a slightly hardcoded one + rm -f ${D}${libdir}/terminfo ${D}${prefix}/lib/terminfo # create linker scripts for libcurses.so and libncurses to # link against -ltinfo when needed. Some builds might break -- cgit v1.2.3-54-g00ecf