From e86ab7487450aea7e44ff70b225517dbb056e3b5 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Tue, 30 Aug 2016 11:32:07 +0300 Subject: This is a backport from master of 2 consecutive fixes. First fix commit: 1100af93cb07caf24d568c039d52fb0c80714c30 Second fix commit: b7b2e348716161deb21c9864ac5caa5f1df1fa9c The 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 Signed-off-by: Richard Purdie * 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: brian avery Signed-off-by: Armin Kuster --- meta/recipes-core/base-files/base-files/profile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/base-files/base-files/profile b/meta/recipes-core/base-files/base-files/profile index ba1b9ba156..1f02e52ea9 100644 --- a/meta/recipes-core/base-files/base-files/profile +++ b/meta/recipes-core/base-files/base-files/profile @@ -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 -- cgit 1.2.3-korg