diff mbox series

[2/2] ncurses: stop moving terminfo files from /usr/share to /etc

Message ID 20260723074054.2125126-2-ravi@prevas.dk
State Under Review
Headers show
Series [1/2] ncurses: put symlinks to basic terminfo files in ncurses-terminfo-base package | expand

Commit Message

Rasmus Villemoes July 23, 2026, 7:40 a.m. UTC 
From: Rasmus Villemoes <ravi@prevas.dk>

Why it is done that way is lost in history; the gentoo reference
doesn't help much, as gentoo nowadays certainly doesn't move the
terminfo files around like that.

This also drops the xterm -> xterm-color symlink. I don't think that
symlink is appropriate nowadays either, as running

  infocmp -L -d xterm xterm-color

shows that "xterm" (aka xterm-new, aka xterm-p370) has far more
capabilities than "xterm-color". So instead, just add plain 'xterm' to
the TERMINFO_BASE variable.

Moreover, as the xterm -> xterm-color symlink only existed under /etc,
people who install the full ncurses-terminfo would have a
/usr/share/terminfo/x/xterm which did not match /etc/terminfo/x/xterm,
and which one an application would pick up is not obvious.

Signed-off-by: Rasmus Villemoes <ravi@prevas.dk>
---
 meta/recipes-core/ncurses/ncurses.inc | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)
diff mbox series

Patch

diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index 8fff9a226f..89668be363 100644
--- a/meta/recipes-core/ncurses/ncurses.inc
+++ b/meta/recipes-core/ncurses/ncurses.inc
@@ -162,7 +162,7 @@  _install_cfgs = "\
 "
 
 TERMINFO_BASE = "alacritty ansi console dumb linux rxvt screen screen-256color sun \
-  tmux tmux-256color vt52 vt100 vt102 vt200 vt220 xterm-color xterm-xfree86 xterm-256color"
+  tmux tmux-256color vt52 vt100 vt102 vt200 vt220 xterm xterm-color xterm-xfree86 xterm-256color"
 
 do_install() {
         # Order of installation is important; widec installs a 'curses.h'
@@ -183,27 +183,6 @@  do_install() {
 
         cd narrowc
 
-        # include some basic terminfo files
-        # stolen ;) from gentoo and modified a bit
-        for x in ${TERMINFO_BASE}
-        do
-                local termfile="$(find "${D}${datadir}/terminfo/" -name "${x}" 2>/dev/null)"
-                local basedir="$(basename $(dirname "${termfile}"))"
-
-                if [ -n "${termfile}" ]
-                then
-                        install -d ${D}${sysconfdir}/terminfo/${basedir}
-                        mv ${termfile} ${D}${sysconfdir}/terminfo/${basedir}/
-                        ln -s /etc/terminfo/${basedir}/${x} \
-                                ${D}${datadir}/terminfo/${basedir}/${x}
-                fi
-        done
-        # i think we can use xterm-color as default xterm
-        if [ -e ${D}${sysconfdir}/terminfo/x/xterm-color ]
-        then
-                ln -sf xterm-color ${D}${sysconfdir}/terminfo/x/xterm
-        fi
-
         # create linker scripts for libcurses.so and libncurses to
         # link against -ltinfo when needed. Some builds might break
         # else when '-Wl,--no-copy-dt-needed-entries' has been set in
@@ -311,7 +290,6 @@  FILES:${PN}-terminfo = "\
 "
 
 FILES:${PN}-terminfo-base = "\
-  ${sysconfdir}/terminfo \
   ${@' '.join(map(lambda x: '${datadir}/terminfo/'+x[0]+'/'+x, '${TERMINFO_BASE}'.split()))} \
 "