[oe-commits] Paul Gortmaker : base-files/profile: change EDITOR to not be busybox specific

git at git.openembedded.org git at git.openembedded.org
Sat Feb 14 08:41:57 UTC 2015


Module: openembedded-core.git
Branch: master
Commit: dcdaa651f3180e4561d7d08f56bfb29f35f2085f
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=dcdaa651f3180e4561d7d08f56bfb29f35f2085f

Author: Paul Gortmaker <paul.gortmaker at windriver.com>
Date:   Wed Jan 21 13:25:06 2015 -0500

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 at windriver.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/recipes-core/base-files/base-files/profile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/base-files/base-files/profile b/meta/recipes-core/base-files/base-files/profile
index 88ab8d8..53c2680 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



More information about the Openembedded-commits mailing list