Merge pull request #15 from hypriot/boot-from-ext4

Boot from ext4 for now

.dockerignore

@@ -1,2 +1,3 @@
 *.xz
 *.gz
+*.zip

.travis.yml

@@ -14,7 +14,7 @@ deploy:
   api_key:
     secure: nr2rOyatwZuzn+FNugjNVEAnG301TqGPsM7CorBMNKH72ND95w/Rf/ruyW/tljoDf4MOEJ+cuyyyONVG+bgxxAkY8dwbtDmrl0W6EjERkvhUqls1WUDLc1r+d3A+OHxpkmXtN5LxPjGaTpt4hYWjv4SEb18yYlmJaE5Nh83IImtVjVA1q2SUzfSe3cYaPKPG522lYO7owB+DWrdA98X8Sd0bdYoMVd1hLWBzicGcK1boA/7u7+RSl/yIZjbLillXYXFiyaU48hYyfIGjbh7/FYw0ofaqsGxn6BLV9EkyQfuyISwAEu5jMKbNRBBrbknVJWGfqW037Ss8lXyaXaFQ3omc43rpb8H90tfv75qn+WBi6Zn0cS/iMCpchkbN7Vx7HbYaqyYnkbK6Yd2yE6Z8pWQXvd9W+2MjZiGT/PKELMLDTUQ/bRpR7erIXuNbgvxpi1MHhHppIpnyRj6NewV8JWlsJ3PJOlkOqMYVezweTL3VzE/0yq5g/IQ0O1LRHIUVMQ9coW6y2/dddQhFy90Ayk8MvI//76jRAs/Vu22dPWWIuYoFTmZXMCAIwXmPBYKrlzk2T+l8F1Ma+jwDw0kCDHq3E5sYfY8vfnLIZRRC1MGnbruPLZJpI8jL075I1kQR954gVmFqGbziDpR0kJZzrInEj01iniEWuyQOljh2msE=
   file:
-    - sd-card-odroid-c2-${TRAVIS_TAG}.img.zip
+    - hypriotos-odroid-c2-${TRAVIS_TAG}.img.zip
   on:
     tags: true
     repo: hypriot/image-builder-odroid-c2

Makefile

@@ -13,7 +13,7 @@ testshell: build
 	docker run -ti --privileged -v $(shell pwd)/builder:/builder -v $(shell pwd):/workspace -v /boot:/boot -v /lib/modules:/lib/modules image-builder-odroid-c2 bash
 
 test:
-	VERSION=dirty docker run --rm -ti --privileged -v $(shell pwd):/workspace -v /boot:/boot -v /lib/modules:/lib/modules -e VERSION image-builder-odroid-c2 bash -c "unzip /workspace/sd-card-odroid-c2-dirty.img.zip && rspec --format documentation --color /workspace/builder/test/*_spec.rb"
+	VERSION=dirty docker run --rm -ti --privileged -v $(shell pwd):/workspace -v /boot:/boot -v /lib/modules:/lib/modules -e VERSION image-builder-odroid-c2 bash -c "unzip /workspace/hypriotos-odroid-c2-dirty.img.zip && rspec --format documentation --color /workspace/builder/test/*_spec.rb"
 
 shellcheck: build
 	VERSION=dirty docker run --rm -ti -v $(shell pwd):/workspace image-builder-odroid-c2 bash -c 'shellcheck /workspace/builder/*.sh /workspace/builder/files/etc/firstboot.d/*'

README.md

@@ -37,7 +37,7 @@ eval $(docker-machine env image-builder-odroid-c2)
 
 ### Build the SD card image
 
-From here you can just make the SD card image. The output will be written and compressed to `sd-card-odroid-c2-dirty.img.zip`.
+From here you can just make the SD card image. The output will be written and compressed to `hypriotos-odroid-c2-dirty.img.zip`.
 
 ```bash
 make sd-image
@@ -56,7 +56,7 @@ make test
 Now flash the SD card image and boot up a ODROID C2. Run the [Serverspec](http://serverspec.org) integration tests in `builder/test-integration/` folder against your ODROID C2. Set the environment variable `BOARD` to the IP address or host name of your running ODROID C2.
 
 ```bash
-flash sd-card-odroid-c2-dirty.img.zip
+flash hypriotos-odroid-c2-dirty.img.zip
 BOARD=black-pearl.local make test-integration
 ```
 

builder/boot.ini

@@ -42,7 +42,7 @@ setenv m "1080p60hz" # Progressive 60Hz
 # setenv m "800x480p60hz"
 # setenv m "800x600p60hz"
 # setenv m "1024x600p60hz"
-# setenv m "1024x768p60hz"  
+# setenv m "1024x768p60hz"
 # setenv m "1280x800p60hz"
 # setenv m "1280x1024p60hz"
 # setenv m "1360x768p60hz"
@@ -78,8 +78,8 @@ setenv loadaddr "0x11000000"
 setenv dtb_loadaddr "0x1000000"
 setenv initrd_loadaddr "0x13000000"
 
-fatload mmc 0:1 ${initrd_loadaddr} uInitrd
-fatload mmc 0:1 ${loadaddr} Image
-fatload mmc 0:1 ${dtb_loadaddr} meson64_odroidc2.dtb
+ext4load mmc 0:1 ${initrd_loadaddr} /boot/uInitrd
+ext4load mmc 0:1 ${loadaddr} /boot/Image
+ext4load mmc 0:1 ${dtb_loadaddr} /boot/meson64_odroidc2.dtb
 
 booti ${loadaddr} ${initrd_loadaddr} ${dtb_loadaddr}

builder/build.sh

@@ -22,7 +22,7 @@ ROOT_PARTITION_SIZE="800M"
 
 # device specific settings
 HYPRIOT_IMAGE_VERSION=${VERSION:="dirty"}
-HYPRIOT_IMAGE_NAME="sd-card-odroid-c2-${HYPRIOT_IMAGE_VERSION}.img"
+HYPRIOT_IMAGE_NAME="hypriotos-odroid-c2-${HYPRIOT_IMAGE_VERSION}.img"
 IMAGE_ROOTFS_PATH="/image-rootfs.tar.gz"
 QEMU_ARCH="aarch64"
 export HYPRIOT_IMAGE_VERSION

builder/chroot-script.sh

@@ -41,13 +41,10 @@ apt-get update
 # # enable Docker systemd service
 # systemctl enable docker
 
-# install ODROID kernel
-
+# install ODROID C2 u-boot and kernel
 apt-get install -y u-boot-tools initramfs-tools
-
-# make the kernel package create a copy of the current kernel here
-touch /boot/uImage
-apt-get install -y linux-image-c2 bootini || apt-get install -f
+apt-get install -y linux-image-c2
+ls -al /boot/*
 
 # set device label and version number
 echo "HYPRIOT_DEVICE=\"$HYPRIOT_DEVICE\"" >> /etc/os-release

builder/test/spec_helper.rb

@@ -2,7 +2,7 @@
 set :backend, :exec
 
 def image_path
-  return "sd-card-odroid-c2-#{ENV['VERSION']}.img"
+  return "hypriotos-odroid-c2-#{ENV['VERSION']}.img"
 end
 
 def run( cmd )