summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2015-01-21 13:25:06 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-14 08:41:00 +0000
commit1cdaf205704198432f78212ba281263a5badc3ec (patch)
tree717f60615bd32a6e2239918a914d098465876b4e /meta
parent34a4413ef7a873e8bfed4153173cc7050965510b (diff)
downloadpoky-1cdaf205704198432f78212ba281263a5badc3ec.tar.gz
base-files/profile: change EDITOR to not be busybox specific
Setting "EDITOR=/bin/vi" breaks on non-busybox systems, as vim will populate /usr/bin/vi instead, and you get stuff like: op3:~/poky/meta-builder$ git commit -s error: cannot run /bin/vi: No such file or directory error: unable to start editor '/bin/vi' Please supply the message using either -m or -F option. op3:~/poky/meta-builder$ which vi /usr/bin/vi op3:~/poky/meta-builder$ Since we've already specified a proper path above in the profile, we've no need to call out where in the path vi lives, and hence this will work with busybox and a full vim install w/o busybox. (From OE-Core rev: dcdaa651f3180e4561d7d08f56bfb29f35f2085f) Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/base-files/base-files/profile2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/base-files/base-files/profile b/meta/recipes-core/base-files/base-files/profile
index 88ab8d877b..53c2680409 100644
--- a/meta/recipes-core/base-files/base-files/profile
+++ b/meta/recipes-core/base-files/base-files/profile
@@ -2,7 +2,7 @@
2# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...). 2# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...).
3 3
4PATH="/usr/local/bin:/usr/bin:/bin" 4PATH="/usr/local/bin:/usr/bin:/bin"
5EDITOR="/bin/vi" # needed for packages like cron 5EDITOR="vi" # needed for packages like cron, git-commit
6test -z "$TERM" && TERM="vt100" # Basic terminal capab. For screen etc. 6test -z "$TERM" && TERM="vt100" # Basic terminal capab. For screen etc.
7 7
8if [ ! -e /etc/localtime -a ! -e /etc/TZ ]; then 8if [ ! -e /etc/localtime -a ! -e /etc/TZ ]; then