diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2022-04-23 07:47:52 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2022-04-23 20:12:14 -0700 |
| commit | e059bf5da05dd895ac5fde665f283022ad5c59d2 (patch) | |
| tree | fbd327a07a92dcbbaa00a111776aa36d80dabb08 | |
| parent | 224d8a8cbeef0c5ccdf03e9f6660203af7abead6 (diff) | |
| download | meta-openembedded-contrib-e059bf5da05dd895ac5fde665f283022ad5c59d2.tar.gz | |
tcsh: Do not install symlinks into /bin with usrmerge
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-shells/tcsh/tcsh_6.22.04.bb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta-oe/recipes-shells/tcsh/tcsh_6.22.04.bb b/meta-oe/recipes-shells/tcsh/tcsh_6.22.04.bb index c4da5cd835..f7282bf1fd 100644 --- a/meta-oe/recipes-shells/tcsh/tcsh_6.22.04.bb +++ b/meta-oe/recipes-shells/tcsh/tcsh_6.22.04.bb @@ -27,8 +27,10 @@ do_install:append () { oe_runmake install.man DESTDIR=${D} install -d ${D}${base_bindir} - ln -s /usr/bin/tcsh ${D}${base_bindir}/tcsh - ln -s /usr/bin/tcsh ${D}${base_bindir}/csh + if ! ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then + ln -s /usr/bin/tcsh ${D}${base_bindir}/tcsh + ln -s /usr/bin/tcsh ${D}${base_bindir}/csh + fi install -d ${D}${sysconfdir}/csh/login.d install -m 0644 ${S}/csh.cshrc ${S}/csh.login ${S}/csh.logout ${S}/complete.tcsh ${D}${sysconfdir} install -D -m 0644 ${S}/csh-mode.el ${D}${datadir}/emacs/site-lisp/csh-mode.el |