summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2018-03-09 14:00:05 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-15 06:27:19 -0700
commit79716684b430492b3d1a5cf6b77bde2843dc0ef0 (patch)
treed0142b6b0d83670b555a7fee00a4366064b0d4ad /meta
parent4712f75761ed093b03262a928539deb33470ae90 (diff)
downloadpoky-79716684b430492b3d1a5cf6b77bde2843dc0ef0.tar.gz
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) Signed-off-by: Koen Kooi <koen.kooi@linaro.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/ncurses/ncurses.inc5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index 106dcb016e..0bfd644d18 100644
--- a/meta/recipes-core/ncurses/ncurses.inc
+++ b/meta/recipes-core/ncurses/ncurses.inc
@@ -201,7 +201,10 @@ do_install() {
201 ln -sf xterm-color ${D}${sysconfdir}/terminfo/x/xterm 201 ln -sf xterm-color ${D}${sysconfdir}/terminfo/x/xterm
202 fi 202 fi
203 203
204 rm -f ${D}${libdir}/terminfo 204 # When changing ${libdir} to e.g. /usr/lib/myawesomelib/ ncurses
205 # still installs '/usr/lib/terminfo', so try to rm both
206 # the proper path and a slightly hardcoded one
207 rm -f ${D}${libdir}/terminfo ${D}${prefix}/lib/terminfo
205 208
206 # create linker scripts for libcurses.so and libncurses to 209 # create linker scripts for libcurses.so and libncurses to
207 # link against -ltinfo when needed. Some builds might break 210 # link against -ltinfo when needed. Some builds might break