Clean up ARM builds

- Check in dtbs and give them their own directory
- Add cubieboard dtbs :)
- Remove hyper-v tools from arm Dockerfile

Signed-off-by: Dave Tucker <dt@docker.com>
This commit is contained in:
Dave Tucker 2016-02-19 14:54:59 +00:00
parent 9669cd10e1
commit 2b5b1e64fa
10 changed files with 4 additions and 5 deletions

View File

@ -2,8 +2,8 @@ FROM justincormack/alpine-qemu
COPY alpine/initrd-arm.img .
COPY alpine/kernel/zImage .
COPY alpine/kernel/dtb .
COPY alpine/kernel/dtb dtb
RUN gzip -9 initrd-arm.img
ENTRYPOINT [ "qemu-system-arm", "-machine", "vexpress-a15", "-cpu", "cortex-a15", "-no-reboot", "-netdev", "user,id=eth0", "-device", "virtio-net-device,netdev=eth0", "-serial", "stdio", "-kernel", "zImage", "-initrd", "initrd-arm.img.gz", "-dtb", "dtb", "-m", "256", "-append", "console=ttyAMA0,38400n8", "-vnc", "none" ]
ENTRYPOINT [ "qemu-system-arm", "-machine", "vexpress-a15", "-cpu", "cortex-a15", "-no-reboot", "-netdev", "user,id=eth0", "-device", "virtio-net-device,netdev=eth0", "-serial", "stdio", "-kernel", "zImage", "-initrd", "initrd-arm.img.gz", "-dtb", "dtb/vexpress-v2p-ca15-tc1.dtb", "-m", "256", "-append", "console=ttyAMA0,38400n8", "-vnc", "none" ]

View File

@ -18,6 +18,8 @@ arm: initrd-arm.img
Dockerfile.armhf: Dockerfile
cat Dockerfile | \
sed 's@FROM alpine@FROM justincormack/armhf-alpine@' | \
sed '/hv_/d' | \
sed '/hvtools/d' | \
sed 's/syslinux//' | \
grep -v 'rc-update add binfmt_misc sysinit' > $@

View File

@ -1,4 +1,3 @@
vmlinuz64
zImage
aufs-utils.tar
dtb

View File

@ -26,7 +26,6 @@ RUN apt-get update && apt-get -y upgrade && apt-get -y install \
gcc-arm-linux-gnueabihf
ADD https://www.kernel.org/pub/linux/kernel/v4.x/linux-${KERNEL_VERSION}.tar.xz .
ADD https://d-i.debian.org/daily-images/armhf/daily/device-tree/vexpress-v2p-ca15-tc1.dtb /dtb
RUN cat linux-${KERNEL_VERSION}.tar.xz | tar --absolute-names -xJ && mv /linux-${KERNEL_VERSION} /linux

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -12,7 +12,6 @@ arm:
$(MAKE) -C mdnstool ARCH=arm
$(MAKE) -C docker ARCH=arm
$(MAKE) -C hupper ARCH=arm
$(MAKE) -C hvtools ARCH=arm
clean:
$(MAKE) -C 9pudc clean