From c498f7ac23fb59ec2d0cbaf0330ddcf6ebc7dada Mon Sep 17 00:00:00 2001
From: Justin Cormack <justin@specialbusservice.com>
Date: Sun, 11 Sep 2016 00:16:06 +0100
Subject: [PATCH] remove broken arm functionality - will rework

Signed-off-by: Justin Cormack <justin@specialbusservice.com>
---
 Makefile        |  8 --------
 alpine/Makefile | 34 +++-------------------------------
 2 files changed, 3 insertions(+), 39 deletions(-)

diff --git a/Makefile b/Makefile
index 9114c5b9b..b8ec4b5de 100644
--- a/Makefile
+++ b/Makefile
@@ -12,14 +12,6 @@ qemu-iso: all
 	docker build -f Dockerfile.qemuiso -t mobyqemuiso:build .
 	docker run -it --rm mobyqemuiso:build
 
-arm:
-	$(MAKE) -C alpine/kernel arm
-	$(MAKE) -C alpine arm
-
-qemu-arm: Dockerfile.qemu.armhf arm
-	docker build -f Dockerfile.qemu.armhf -t mobyarmqemu:build .
-	docker run -it --rm mobyarmqemu:build
-
 test: Dockerfile.test all
 	tar cf - Dockerfile.test alpine/initrd.img.gz alpine/kernel/x86_64/vmlinuz64 | \
 	  docker build -f Dockerfile.test -t mobytest:build -
diff --git a/alpine/Makefile b/alpine/Makefile
index 950136ea0..41cce6627 100644
--- a/alpine/Makefile
+++ b/alpine/Makefile
@@ -3,10 +3,7 @@ all:	initrd.img.gz mobylinux-efi.iso
 ETCFILES=etc/issue etc/motd etc/network/interfaces
 ETCFILES+=etc/inittab etc/fstab
 
-initrd.img: Dockerfile mkinitrd.sh init $(ETCFILES)
-	rm -f initrd.img
-	$(MAKE) -j -C packages
-	$(MAKE) -C kernel
+initrd.img: Dockerfile mkinitrd.sh init $(ETCFILES) common
 	tar cf - \
 	  Dockerfile etc init mkinitrd.sh \
 	  -C kernel usr etc sbin lib -C .. \
@@ -48,33 +45,9 @@ mobylinux-bios.iso: initrd.img Dockerfile.bios isolinux.cfg
 	docker build -t moby-bios:build -f Dockerfile.bios .
 	docker run --net=none --rm moby-bios:build cat /tmp/mobylinux-bios.iso > $@
 
-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//' | \
-	  sed '/proxy/d' | \
-	  sed '/diagnostics/d' | \
-	  sed '/nc-vsock/d' | \
-	  sed '/vsudd/d' | \
-	  sed '/gummiboot/d' | \
-	  grep -v 'tap-vsockd' | \
-	  grep -v '9pmount-vsock' | \
-	  grep -v 'rc-update add binfmt_misc sysinit' > $@
-
-initrd-arm.img: Dockerfile.armhf
-	rm -f initrd-arm.img
-	$(MAKE) -C packages arm
-	$(MAKE) -C kernel arm
-	docker build -t moby-arm:build -f Dockerfile.armhf .
-	docker run --net=none --rm moby-arm:build /bin/mkinitrd.sh > $@
-
 common: initrd.img
 	$(MAKE) -C kernel
-	$(MAKE) -C packages
+	$(MAKE) -j -C packages
 
 ami: common
 	docker-compose build ami
@@ -89,11 +62,10 @@ azure: common
 	docker-compose run --rm -T azure uploadvhd
 
 clean:
-	rm -f initrd.img initrd.img.gz initrd-arm.img Dockerfile.armhf mobylinux.vhd mobylinux.img
+	rm -f initrd.img initrd.img.gz mobylinux.vhd mobylinux.img
 	rm -f mobylinux-bios.iso mobylinux-efi.iso mobylinux.efi
 	docker images -q moby-efi:build | xargs docker rmi -f || true
 	docker images -q moby-bios:build | xargs docker rmi -f || true
-	docker images -q moby-arm:build | xargs docker rmi -f || true
 	docker images -q alpine_ami:latest | xargs docker rmi -f || true
 	docker images -q alpine_azure:latest | xargs docker rmi -f || true
 	$(MAKE) -C packages clean