Merge pull request #9 from sbadia/dockerwhite

Add missing packages in Dockerfile and an hint about olinux ip address

Dockerfile

@@ -14,7 +14,7 @@ RUN apt-get install --force-yes -y emdebian-archive-keyring
 RUN apt-get update
 
 # Install packages for kernel and u-boot compilation
-RUN apt-get install --force-yes -y gcc-4.7-arm-linux-gnueabihf ncurses-dev uboot-mkimage build-essential git vim libusb-1.0-0-dev pkg-config bc netpbm
+RUN apt-get install --force-yes -y gcc-4.7-arm-linux-gnueabihf ncurses-dev uboot-mkimage build-essential git vim libusb-1.0-0-dev pkg-config bc netpbm wget tar
 
 RUN ln -s /usr/bin/arm-linux-gnueabihf-gcc-4.7 /usr/bin/arm-linux-gnueabihf-gcc
 

README.md

@@ -27,10 +27,10 @@ sudo docker run --privileged -i -t -v $(pwd)/olinux/:/olinux/ debian:olinux bash
 ```
 
 Optional arguments:
-+ -o offline mode; doesn't pull repositories so you should have run the script once without this option
++ -o off-line mode; doesn't pull repositories so you should have run the script once without this option
 + -b <type> board type (lime,lime2,micro) default is A20 lime
 + -t <number> number of thread for compilation
-+ -l change linux logo on u-boot and kernel 
++ -l change linux logo on u-boot and kernel
 
 # Build minimal arm debootstrap
 
@@ -55,13 +55,13 @@ Optional arguments:
 ## Setup SD card device
 
 Find your device card (with dmesg for instance). Call create_device script with
-this device in parameter. This script install debootstrap previously build. 
+this device in parameter. This script install debootstrap previously build.
 
 ```shell
 sudo bash olinux/create_device.sh -d /dev/sdc
 ```
 
-You can directly create a image file that you can copy after on your sd card or share with others. 
+You can directly create a image file that you can copy after on your sd card or share with others.
 
 ```shell
 sudo bash olinux/create_device.sh -d img -s 500
@@ -74,6 +74,8 @@ image (change the -s 500 parameter).
 
 Find IP and ssh on it! (password: olinux)
 
+**hint**: The IP address is displayed on the login screen, but you must plug a screen.
+
 ```shell
 ssh root@mybox
 ```
@@ -83,7 +85,6 @@ ssh root@mybox
 ## Convert bmp logo to ppm
 
 ```shell
-
 bmptoppm Labriqueinter.net.bmp > Labriqueinter.net.ppm
 ppmquant 224 Labriqueinter.net.ppm > Labriqueinter.net224.ppm
 nmnoraw Labriqueinter.net224.ppm > Labriqueinter.net.ppm

olinux/create_arm_debootstrap.sh

@@ -21,8 +21,8 @@ cat <<EOF
   -t		target directory for debootstrap	(default: /olinux/debootstrap)
   -i		install sunxi kernel files; you should have build them before.
   -y		install yunohost (doesn't work with cross debootstrap)
-  -c		cross debootstrap 
-  -p		use aptcacher proxy 
+  -c		cross debootstrap
+  -p		use aptcacher proxy
 
 EOF
 exit 1
@@ -80,7 +80,7 @@ if [ ${CROSS} ] ; then
   # Debootstrap
   mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc
   bash ${REP}/script/binfmt-misc-arm.sh unregister
-  bash ${REP}/script/binfmt-misc-arm.sh 
+  bash ${REP}/script/binfmt-misc-arm.sh
   debootstrap --arch=armhf --foreign $DEBIAN_RELEASE $TARGET_DIR
   cp /usr/bin/qemu-arm-static $TARGET_DIR/usr/bin/
   cp /etc/resolv.conf $TARGET_DIR/etc
@@ -195,10 +195,10 @@ if [ ${CROSS} ] ; then
 fi
 
 if [ ${APTCACHER} ] ; then
-  rm $TARGET_DIR/etc/apt/apt.conf.d/01proxy 
+  rm $TARGET_DIR/etc/apt/apt.conf.d/01proxy
 fi
 
-# Umount proc, sys, and dev 
+# Umount proc, sys, and dev
 umount -l $TARGET_DIR/dev/pts
 umount -l $TARGET_DIR/dev
 umount -l $TARGET_DIR/proc

olinux/create_device.sh

@@ -62,15 +62,15 @@ if [ "${DEVICE}" = "img" ] ; then
   rm -f ${TARGET}
   # create image file
   dd if=/dev/zero of=${TARGET} bs=1MB count=$IMGSIZE status=noxfer >/dev/null 2>&1
-  
+
   # find first avaliable free device
   DEVICE=$(losetup -f)
   IMGSIZE="100%"
   TYPE="loop"
-  
+
   # mount image as block device
   losetup $DEVICE ${TARGET}
-  
+
   sync
 
 elif [ ! -z $IMGSIZE ] ; then
@@ -81,7 +81,7 @@ fi
 
 # create one partition starting at 2048 which is default
 echo "- Partitioning"
-parted --script $DEVICE mklabel msdos 
+parted --script $DEVICE mklabel msdos
 parted --script $DEVICE mkpart primary ext4 2048s ${IMGSIZE}
 parted --script $DEVICE align-check optimal 1
 

olinux/create_sunxi_boot_files.sh

@@ -125,7 +125,7 @@ fi
 if [ ${CROSS} ] ; then
   make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf-
 else
-  make CC=/usr/bin/gcc-4.7 
+  make CC=/usr/bin/gcc-4.7
 fi
 
 # Linux kernel