Merge pull request #2 from hypriot/improve-builder

Improve builder

Author: StefanScherer

Dockerfile

@@ -1,12 +1,10 @@
 FROM debian:jessie
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
-    build-essential \
+    dosfstools \
     kpartx \
-    zip \
     ruby \
-    ruby-dev \
-    dosfstools \
+    zip \
     --no-install-recommends && \
     rm -rf /var/lib/apt/lists/*
 

Makefile

@@ -1,4 +1,3 @@
-.PHONY: build
 default: build
 
 build:
@@ -8,7 +7,10 @@ rpi-raw-image: build
 	docker run --rm --privileged -v $(shell pwd):/workspace image-builder-raw /workspace/builder/rpi/build.sh
 
 shell: build
-	docker run -ti --privileged -v $(shell pwd):/workspace image-builder-raw bash
+	docker run --rm -ti --privileged -v $(shell pwd):/workspace image-builder-raw bash
+
+testshell: build
+	docker run --rm -ti --privileged -v $(shell pwd)/builder:/builder -v $(shell pwd):/workspace image-builder-raw bash
 
 tag:
 	git tag ${TAG}

builder/rpi/build.sh

@@ -12,13 +12,18 @@ IMAGE_PATH="rpi-raw.img"
 SD_CARD_SIZE="1500"
 BOOT_PARTITION_SIZE="64"
 
+# Create empty BOOT/ROOTFS image file
+# - SD_CARD_SIZE in MByte
+# - DD uses 256 Bytes
+# - sector block size is 512Bytes
+# - MBR size is 512 Bytes, so we start at sector 2048 (1MByte reserved space)
 BOOTFS_START=2048
 BOOTFS_SIZE=$(expr ${BOOT_PARTITION_SIZE} \* 2048)
 ROOTFS_START=$(expr ${BOOTFS_SIZE} + ${BOOTFS_START})
-SD_MINUS_DD=$(expr ${SD_CARD_SIZE} - 256)  # old config: 1280 - 256 = 1024 for rootfs
-ROOTFS_SIZE=$(expr ${SD_MINUS_DD} \* 1000000 / 512 - ${ROOTFS_START})
+SD_MINUS_DD=$(expr ${SD_CARD_SIZE} \* 1024 \* 1024 - 256)
+ROOTFS_SIZE=$(expr ${SD_MINUS_DD} / 512 - ${ROOTFS_START})
 
-dd if=/dev/zero of=${IMAGE_PATH} bs=1MB count=${SD_CARD_SIZE}
+dd if=/dev/zero of=${IMAGE_PATH} bs=1MiB count=${SD_CARD_SIZE}
 
 DEVICE=$(losetup -f --show ${IMAGE_PATH})
 

builder/rpi/test/image_spec.rb

@@ -24,5 +24,13 @@
     it "has a root-partition with a sda2 Linux filesystem" do
       expect(stdout).to contain('^.*\.img2 .*Linux$')
     end
+
+    it "partition sda1 starts at sector 2048" do
+      expect(stdout).to contain('^.*\.img1\ *2048 .*$')
+    end
+
+    it "partition sda1 has a size of 64M" do
+      expect(stdout).to contain('^.*\.img1.* 64M  c.*$')
+    end
   end
 end