mirror of
https://git.yoctoproject.org/poky
synced 2026-04-05 08:02:25 +02:00
This is a backport from master of 2 consecutive fixes.
First fix commit:1100af93cbSecond fix commit:b7b2e34871The error these commits fix can prevent Eclipse debugging on certain target configurations. * base-files: Add shell test quoting tty can return "not a tt" which results in warnings when /etc/profile is executed. (From OE-Core rev: eed586dd238efe859442b21b425f04e262bcdb2b) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> * base-files: fix profile error under < /dev/null Previous attempts to constrain execution of `resize` to only TTYs did not properly handle situations when `tty` would return the string "not a tty". The symptom is "/etc/profile: line 34: test: too many arguments". Fix this by utilizing the exit code of `tty`. Also use `case` instead of `cut` to eliminate a subshell. (From OE-Core rev: e67637e4472ff3a1e2801b84ee3d69d4e14b9efc) Signed-off-by: Richard Tollerton <rich.tollerton@ni.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (From OE-Core rev: e86ab7487450aea7e44ff70b225517dbb056e3b5) Signed-off-by: brian avery <brian.avery@intel.com> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
ec240f45ae
commit
f7e1cd9f85
@@ -28,10 +28,12 @@ if [ -d /etc/profile.d ]; then
|
||||
unset i
|
||||
fi
|
||||
|
||||
if [ -x /usr/bin/resize ];then
|
||||
if [ -x /usr/bin/resize ] && termpath="`tty`"; then
|
||||
# Make sure we are on a serial console (i.e. the device used starts with /dev/tty),
|
||||
# otherwise we confuse e.g. the eclipse launcher which tries do use ssh
|
||||
test `tty | cut -c1-8` = "/dev/tty" && resize >/dev/null
|
||||
case "$termpath" in
|
||||
/dev/tty*) resize >/dev/null
|
||||
esac
|
||||
fi
|
||||
|
||||
export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM
|
||||
|
||||
Reference in New Issue
Block a user