Improve Vagrant support

Fixes #676

.gitignore

@@ -9,6 +9,7 @@ ubuntu-*-cloudimg-console.log
 /config-*.conf
 ### but not default (supplied) files
 !/config-docker.conf
+!/config-vagrant.conf
 
 ### output directories
 /.tmp/

Vagrantfile

@@ -1,6 +1,26 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
+Vagrant.require_version ">= 1.5"
+
+$provisioning_script = <<SCRIPT
+dpkg --add-architecture i386
+apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y dist-upgrade && \
+	DEBIAN_FRONTEND=noninteractive apt-get install -y git dialog lsb-release binutils wget ca-certificates device-tree-compiler \
+	pv bc lzop zip binfmt-support build-essential ccache debootstrap ntpdate gawk gcc-arm-linux-gnueabihf gcc-arm-linux-gnueabi \
+	qemu-user-static u-boot-tools uuid-dev zlib1g-dev unzip libusb-1.0-0-dev ntpdate parted pkg-config libncurses5-dev whiptail \
+	debian-keyring debian-archive-keyring f2fs-tools libfile-fcntllock-perl rsync libssl-dev nfs-kernel-server btrfs-tools \
+	gcc-aarch64-linux-gnu ncurses-term p7zip-full dos2unix dosfstools libc6-dev-armhf-cross libc6-dev-armel-cross libc6-dev-arm64-cross \
+	curl gcc-arm-none-eabi libnewlib-arm-none-eabi patchutils python liblz4-tool libpython2.7-dev linux-base swig libpython-dev \
+	systemd-container udev distcc libstdc++-arm-none-eabi-newlib gcc-4.9-arm-linux-gnueabihf gcc-4.9-aarch64-linux-gnu \
+	g++-4.9-arm-linux-gnueabihf g++-4.9-aarch64-linux-gnu g++-5-aarch64-linux-gnu g++-5-arm-linux-gnueabihf lib32stdc++6 \
+	libc6-i386 lib32ncurses5 lib32tinfo5 locales ncurses-base zlib1g:i386 aptly
+locale-gen en_US.UTF-8
+git clone https://github.com/armbian/build /home/ubuntu/armbian
+ln -sf /vagrant/output /home/ubuntu/armbian/output
+ln -sf /vagrant/userpatches /home/ubuntu/armbian/userpatches
+SCRIPT
+
 Vagrant.configure(2) do |config|
 
     # What box should we base this build on?
@@ -14,30 +34,25 @@ Vagrant.configure(2) do |config|
     # Default images are not big enough to build Armbian.
     config.disksize.size = "40GB"
 
-    #######################################################################
+    # provisioning: install dependencies, download the repository copy
-    # We could sync more folders (that *seems* like the best way to go),
+    config.vm.provision "shell", inline: $provisioning_script
-    # but in many cases builds fail because hardlinks are not supported.
-    # So, a more failproof approach is to just use a larger disk.
-    #
-    # Following the directory structure outlined here:
-    # https://docs.armbian.com/Developer-Guide_Build-Process/#directory-structure
 
-    # So we don't have to download the code a 2nd time.
+    # forward terminal type for better compatibility with Dialog - disabled on Ubuntu by default
-    config.vm.synced_folder ".", "/home/ubuntu/lib"
+    config.ssh.forward_env = ["TERM"]
 
-    # Share folders with the host to make it easy to get our images out.
+    # default user name is "ubuntu", please do not change it
-    config.vm.synced_folder "../output", "/home/ubuntu/output", create: true
 
-    # Bring over your customizations.
+    # SSH password auth is disabled by default, uncomment to enable and set the password
-    config.vm.synced_folder "../userpatches", "/home/ubuntu/userpatches", create: true
+    #config.ssh.password = "armbian"
 
     config.vm.provider "virtualbox" do |vb|
         vb.name = "Armbian Builder"
-        vb.gui = true
+
+        # uncomment this to use the VirtualBox GUI
+        #vb.gui = true
 
         # Tweak these to fit your needs.
-        vb.memory = "8192"
+        #vb.memory = "8192"
-        vb.cpus = "4"
+        #vb.cpus = "4"
-
     end
 end

config-vagrant.conf

@@ -0,0 +1,22 @@
+# DO NOT EDIT THIS FILE
+#
+# This is a Vagrant launcher file. To set up the configuration, use command line arguments to compile.sh
+# or create a config file named "config-vagrant-guest.conf" based on config-example.conf
+
+# remove "vagrant" from the command line since "vagrant-guest" will be passed instead
+shift
+
+# TODO: copy the command line into a new config file on guest
+display_alert "Building and running the Vagrant box"
+vagrant up
+
+# TODO: add docs about private key and conversions
+
+display_alert "SSH config for the Vagrant box"
+
+vagrant ssh-config
+
+display-alert "Use 'vagrant halt' to stop the box"
+
+# don't need to proceed further on the host
+exit 0

lib/general.sh

@@ -477,7 +477,7 @@ prepare_host()
 	fi
 
 	# packages list for host
-	# NOTE: please sync any changes here with the Dockerfile
+	# NOTE: please sync any changes here with the Dockerfile and Vagrantfile
 	local hostdeps="wget ca-certificates device-tree-compiler pv bc lzop zip binfmt-support build-essential ccache debootstrap ntpdate \
 	gawk gcc-arm-linux-gnueabihf gcc-arm-linux-gnueabi qemu-user-static u-boot-tools uuid-dev zlib1g-dev unzip libusb-1.0-0-dev ntpdate \
 	parted pkg-config libncurses5-dev whiptail debian-keyring debian-archive-keyring f2fs-tools libfile-fcntllock-perl rsync libssl-dev \