From 0c99df9481cae87d42413ad647425ecfe044a42e Mon Sep 17 00:00:00 2001 From: Josef 'Jeff' Sipek Date: Mon, 14 Jan 2019 07:55:28 -0500 Subject: [PATCH] install vim-core explicitly The 1.2 userland build had a missing dependency - editor/vim needs to depend on editor/vim/vim-core. This resulted in the installed system not having vim installed. This commit explicitly installs vim-core so that we can make a point release without rebuilding everything. --- build_image.sh | 2 +- build_zfs_send.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build_image.sh b/build_image.sh index ec9896c..f4fd57b 100755 --- a/build_image.sh +++ b/build_image.sh @@ -131,7 +131,7 @@ SYSTEM="system/boot/real-mode DEBUG_PKGS="developer/debug/mdb system/kernel/dtrace/providers" PARTS="system/core-os system/kernel - shell/pipe-viewer editor/vim web/curl + shell/pipe-viewer editor/vim editor/vim/vim-core web/curl developer/linker openssh diagnostic/diskinfo shell/bash" diff --git a/build_zfs_send.sh b/build_zfs_send.sh index 3b22eac..6806264 100755 --- a/build_zfs_send.sh +++ b/build_zfs_send.sh @@ -49,7 +49,7 @@ do esac done -USERLAND_PACKAGES='gnu-tar bzip2 gzip xz autoconf automake automake-111 automake-115 gnu-gettext gnu-make libtool makedepend pkgconf gawk gdb gcc-49 gcc-6 flex swig git vim gnu-findutils libevent2 libidn nghttp2 pcre pkg openssh ntp bash pipe-viewer zsh system/mozilla-nss screen tmux gnu-grep gnu-patch curl wget xproto setuptools cdrtools' +USERLAND_PACKAGES='gnu-tar bzip2 gzip xz autoconf automake automake-111 automake-115 gnu-gettext gnu-make libtool makedepend pkgconf gawk gdb gcc-49 gcc-6 flex swig git vim vim-core gnu-findutils libevent2 libidn nghttp2 pcre pkg openssh ntp bash pipe-viewer zsh system/mozilla-nss screen tmux gnu-grep gnu-patch curl wget xproto setuptools cdrtools' name=$1 if [[ -z "$name" ]]; then -- 2.11.4.GIT