Buildroot 2018-11 (#258)
* Update to buildroot 2018.11 * containerd update * runc update * runc docker engine * runc docker proxy * update rpi firmware * update network manager * update dhcpd * update wait on network * update rpi wifi * revert glibc
This commit is contained in:
@@ -4,16 +4,14 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
VIM_VERSION = v8.0.0329
|
||||
VIM_VERSION = v8.1.0133
|
||||
VIM_SITE = $(call github,vim,vim,$(VIM_VERSION))
|
||||
# Win over busybox vi since vim is more feature-rich
|
||||
VIM_DEPENDENCIES = \
|
||||
ncurses $(TARGET_NLS_DEPENDENCIES) \
|
||||
$(if $(BR2_PACKAGE_BUSYBOX),busybox)
|
||||
VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES)
|
||||
VIM_SUBDIR = src
|
||||
VIM_CONF_ENV = \
|
||||
vim_cv_toupper_broken=no \
|
||||
vim_cv_terminfo=yes \
|
||||
vim_cv_tgetent=zero \
|
||||
vim_cv_tty_group=world \
|
||||
vim_cv_tty_mode=0620 \
|
||||
vim_cv_getcwd_broken=no \
|
||||
@@ -65,9 +63,15 @@ define VIM_REMOVE_DOCS
|
||||
endef
|
||||
|
||||
# Avoid oopses with vipw/vigr, lack of $EDITOR and 'vi' command expectation
|
||||
ifeq ($(BR2_ROOTFS_MERGED_USR),y)
|
||||
define VIM_INSTALL_VI_SYMLINK
|
||||
ln -sf /usr/bin/vim $(TARGET_DIR)/bin/vi
|
||||
ln -sf vim $(TARGET_DIR)/usr/bin/vi
|
||||
endef
|
||||
else
|
||||
define VIM_INSTALL_VI_SYMLINK
|
||||
ln -sf ../usr/bin/vim $(TARGET_DIR)/bin/vi
|
||||
endef
|
||||
endif
|
||||
VIM_POST_INSTALL_TARGET_HOOKS += VIM_INSTALL_VI_SYMLINK
|
||||
|
||||
ifeq ($(BR2_PACKAGE_VIM_RUNTIME),y)
|
||||
|
||||
Reference in New Issue
Block a user