Merge pull request #23 from taziden/typo

update dockerfile to reflect debian cross compilation changes and replace vim by vim-nox

Dockerfile

@@ -2,20 +2,15 @@ FROM debian:jessie
 MAINTAINER Émile Morel
 
 # U-boot part
-RUN echo deb http://www.emdebian.org/debian unstable main > /etc/apt/sources.list.d/emdebian.list
 ENV DEBIAN_FRONTEND noninteractive
 ENV DEBCONF_NONINTERACTIVE_SEEN true
 ENV LC_ALL C
 ENV LANGUAGE C
 ENV LANG C
 RUN apt-get update
-RUN apt-get install --force-yes -y emdebian-archive-keyring
+RUN apt-get install --force-yes -y curl ncurses-dev u-boot-tools build-essential git vim libusb-1.0-0-dev pkg-config bc netpbm wget bzip2 debootstrap dpkg-dev qemu binfmt-support qemu-user-static apt-cacher
+RUN echo deb http://emdebian.org/tools/debian/ jessie main > /etc/apt/sources.list.d/emdebian.list
+RUN curl http://emdebian.org/tools/debian/emdebian-toolchain-archive.key | apt-key add -
+RUN dpkg --add-architecture armhf
 RUN apt-get update
-
-# Install packages for kernel and u-boot compilation
-RUN apt-get install --force-yes -y gcc-4.9-arm-linux-gnueabihf ncurses-dev uboot-mkimage build-essential git vim libusb-1.0-0-dev pkg-config bc netpbm wget tar bzip2
-
-RUN ln -s /usr/bin/arm-linux-gnueabihf-gcc-4.9 /usr/bin/arm-linux-gnueabihf-gcc
-
-# Install packages for debootstrap
-RUN apt-get install --force-yes -y debootstrap dpkg-dev qemu binfmt-support qemu-user-static dpkg-cross
+RUN apt-get install --force-yes -y crossbuild-essential-armhf

olinux/create_arm_debootstrap.sh

@@ -115,8 +115,8 @@ fi
 
 chroot_deb $TARGET_DIR 'apt-get update'
 
-# Add usefull packages
-chroot_deb $TARGET_DIR "apt-get install -y --force-yes openssh-server ntp parted locales vim bash-completion rng-tools $PACKAGES"
+# Add useful packages
+chroot_deb $TARGET_DIR "apt-get install -y --force-yes openssh-server ntp parted locales vim-nox bash-completion rng-tools $PACKAGES"
 echo 'HRNGDEVICE=/dev/urandom' >> $TARGET_DIR/etc/default/rng-tools
 echo '. /etc/bash_completion' >> $TARGET_DIR/root/.bashrc