From: Koen Kooi Date: Mon, 23 Aug 2010 18:04:25 +0000 (+0200) Subject: Revert "base-files: beagleboard: profile: use nano" X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4522417763213a44d4c72da97a0c8380ee68799f;p=openembedded.git Revert "base-files: beagleboard: profile: use nano" This is a distro setting, not a machine setting This reverts commit c323496195aaec26055da823a6c0166c7836c6b2. --- diff --git a/recipes/base-files/base-files/beagleboard/profile b/recipes/base-files/base-files/beagleboard/profile deleted file mode 100644 index 301fc93078..0000000000 --- a/recipes/base-files/base-files/beagleboard/profile +++ /dev/null @@ -1,41 +0,0 @@ -# /etc/profile: system-wide .profile file for the Bourne shell (sh(1)) -# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...). - -PATH="/usr/local/bin:/usr/bin:/bin" -# EDITOR needed for packages like cron -if [ -z "$EDITOR" ]; then - if [ -x /usr/bin/nano ]; then - EDITOR="/usr/bin/nano" - else - EDITOR="/bin/vi" - fi -fi -test -z "$TERM" && TERM="vt100" # Basic terminal capab. For screen etc. - -if [ ! -e /etc/localtime -a ! -e /etc/TZ ]; then - TZ="UTC" # Time Zone. Look at http://theory.uwinnipeg.ca/gnu/glibc/libc_303.html - # for an explanation of how to set this to your local timezone. - export TZ -fi - -if [ "`id -u`" -eq 0 ]; then - 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\$ ' -fi - -if [ -d /etc/profile.d ]; then - for i in /etc/profile.d/*.sh; do - if [ -r $i ]; then - . $i - fi - done - unset i -fi - -export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM - -umask 022 - diff --git a/recipes/base-files/base-files_3.0.14.bb b/recipes/base-files/base-files_3.0.14.bb index ab554bb920..f8d07781ba 100644 --- a/recipes/base-files/base-files_3.0.14.bb +++ b/recipes/base-files/base-files_3.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Miscellaneous files for the base system." SECTION = "base" PRIORITY = "required" -PR = "r98" +PR = "r97" LICENSE = "GPL" SRC_URI = " \