Yocto 2.3
Move OpenBMC to Yocto 2.3(pyro).
Tested: Built and verified Witherspoon and Palmetto images
Change-Id: I50744030e771f4850afc2a93a10d3507e76d36bc
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Resolves: openbmc/openbmc#2461
diff --git a/import-layers/yocto-poky/meta/recipes-core/base-files/base-files/profile b/import-layers/yocto-poky/meta/recipes-core/base-files/base-files/profile
index c616616..ceaf15f 100644
--- a/import-layers/yocto-poky/meta/recipes-core/base-files/base-files/profile
+++ b/import-layers/yocto-poky/meta/recipes-core/base-files/base-files/profile
@@ -6,28 +6,29 @@
test -z "$TERM" && TERM="vt100" # Basic terminal capab. For screen etc.
if [ "$HOME" = "ROOTHOME" ]; then
- PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin
+ PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin
fi
if [ "$PS1" ]; then
-# works for bash and ash (no other shells known to be in use here)
- PS1='\u@\h:\w\$ '
+ # works for bash and ash (no other shells known to be in use here)
+ PS1='\u@\h:\w\$ '
fi
if [ -d /etc/profile.d ]; then
- for i in /etc/profile.d/*.sh ; do
- if [ -f $i -a -r $i ]; then
- . $i
- fi
- done
- unset i
+ for i in /etc/profile.d/*.sh; do
+ if [ -f $i -a -r $i ]; then
+ . $i
+ fi
+ done
+ unset i
fi
-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
- case "$termpath" in
- /dev/tty[A-z]*) resize >/dev/null
- esac
+if command -v resize >/dev/null && command -v tty >/dev/null; then
+ # Make sure we are on a serial console (i.e. the device used starts with
+ # /dev/tty[A-z]), otherwise we confuse e.g. the eclipse launcher which
+ # tries do use ssh
+ case $(tty) in
+ /dev/tty[A-z]*) resize >/dev/null;;
+ esac
fi
export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM