Message ID | 20240307065030.962191-1-changqing.li@windriver.com |
---|---|
State | Accepted, archived |
Commit | daff3b4bf9d7b77a8170d9bc6f0b9c81b0a077d7 |
Headers | show |
Series | [V7] rxvt-unicode: Fix installing of terminfo | expand |
Thanks, this is fine. Alex On Thu, 7 Mar 2024 at 07:50, Changqing Li <changqing.li@eng.windriver.com> wrote: > > From: Changqing Li <changqing.li@windriver.com> > > For cross compile, TIC will be native tic in recipe-sysroot-native, and > the terminfo path will be native path, the rxvt-unicode terminfo will be > wrongly installed to native path. > > install terminfo to correct path in do_install > > Signed-off-by: Changqing Li <changqing.li@windriver.com> > --- > meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc > index e7d520ebef..016614b19c 100644 > --- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc > +++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc > @@ -6,7 +6,7 @@ terminal emulator rxvt, modified to store text in Unicode \ > output. It also supports mixing multiple fonts at the \ > same time, including Xft fonts." > HOMEPAGE = "https://rxvt.org/" > -DEPENDS = "virtual/libx11 libxt libxft gdk-pixbuf libxmu libptytty" > +DEPENDS = "virtual/libx11 libxt libxft gdk-pixbuf libxmu libptytty ncurses-native" > > SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \ > file://xwc.patch \ > @@ -53,6 +53,9 @@ do_install:append () { > > install -m 0644 ${WORKDIR}/rxvt.png ${D}/${datadir}/pixmaps > install -m 0644 ${WORKDIR}/rxvt.desktop ${D}/${datadir}/applications > + > + ${STAGING_BINDIR_NATIVE}/tic -x ${S}/doc/etc/rxvt-unicode.terminfo -o ${D}${datadir}/terminfo || \ > + ${STAGING_BINDIR_NATIVE}/tic ${S}/doc/etc/rxvt-unicode.terminfo -o ${D}${datadir}/terminfo > } > > -FILES:${PN} += "${datadir}/applications/rxvt.desktop ${datadir}/pixmaps/rxvt.png" > +FILES:${PN} += "${datadir}/applications/rxvt.desktop ${datadir}/pixmaps/rxvt.png ${datadir}/terminfo" > -- > 2.25.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#196772): https://lists.openembedded.org/g/openembedded-core/message/196772 > Mute This Topic: https://lists.openembedded.org/mt/104782953/1686489 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc index e7d520ebef..016614b19c 100644 --- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc +++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc @@ -6,7 +6,7 @@ terminal emulator rxvt, modified to store text in Unicode \ output. It also supports mixing multiple fonts at the \ same time, including Xft fonts." HOMEPAGE = "https://rxvt.org/" -DEPENDS = "virtual/libx11 libxt libxft gdk-pixbuf libxmu libptytty" +DEPENDS = "virtual/libx11 libxt libxft gdk-pixbuf libxmu libptytty ncurses-native" SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \ file://xwc.patch \ @@ -53,6 +53,9 @@ do_install:append () { install -m 0644 ${WORKDIR}/rxvt.png ${D}/${datadir}/pixmaps install -m 0644 ${WORKDIR}/rxvt.desktop ${D}/${datadir}/applications + + ${STAGING_BINDIR_NATIVE}/tic -x ${S}/doc/etc/rxvt-unicode.terminfo -o ${D}${datadir}/terminfo || \ + ${STAGING_BINDIR_NATIVE}/tic ${S}/doc/etc/rxvt-unicode.terminfo -o ${D}${datadir}/terminfo } -FILES:${PN} += "${datadir}/applications/rxvt.desktop ${datadir}/pixmaps/rxvt.png" +FILES:${PN} += "${datadir}/applications/rxvt.desktop ${datadir}/pixmaps/rxvt.png ${datadir}/terminfo"