aboutsummaryrefslogtreecommitdiffstats
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:40:35 +0000
commitdcdaa651f3180e4561d7d08f56bfb29f35f2085f (patch)
tree2638def4b57ec3d7318ed2cf64ba45dbac288f48
parent62052810dbf3ed19697078a48b617bfbdadf2a29 (diff)
downloadopenembedded-core-contrib-dcdaa651f3180e4561d7d08f56bfb29f35f2085f.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. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-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 @@
# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...).
PATH="/usr/local/bin:/usr/bin:/bin"
-EDITOR="/bin/vi" # needed for packages like cron
+EDITOR="vi" # needed for packages like cron, git-commit
test -z "$TERM" && TERM="vt100" # Basic terminal capab. For screen etc.
if [ ! -e /etc/localtime -a ! -e /etc/TZ ]; then