github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-27 04:28:20 +00:00
Code Issues Projects Releases Wiki Activity

remove broken arm functionality - will rework

Browse Source 
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
This commit is contained in:
Justin Cormack 2016-09-11 00:16:06 +01:00 committed by Justin Cormack
parent 347328f348
commit c498f7ac23
2 changed files with 3 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -12,14 +12,6 @@ qemu-iso: all
docker build -f Dockerfile.qemuiso -t mobyqemuiso:build . docker build -f Dockerfile.qemuiso -t mobyqemuiso:build .
docker run -it --rm 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 test: Dockerfile.test all
tar cf - Dockerfile.test alpine/initrd.img.gz alpine/kernel/x86_64/vmlinuz64 | \ tar cf - Dockerfile.test alpine/initrd.img.gz alpine/kernel/x86_64/vmlinuz64 | \
docker build -f Dockerfile.test -t mobytest:build - docker build -f Dockerfile.test -t mobytest:build -

34
alpine/Makefile
View File

@ -3,10 +3,7 @@ all: initrd.img.gz mobylinux-efi.iso
ETCFILES=etc/issue etc/motd etc/network/interfaces ETCFILES=etc/issue etc/motd etc/network/interfaces
ETCFILES+=etc/inittab etc/fstab ETCFILES+=etc/inittab etc/fstab
initrd.img: Dockerfile mkinitrd.sh init $(ETCFILES) initrd.img: Dockerfile mkinitrd.sh init $(ETCFILES) common
rm -f initrd.img
$(MAKE) -j -C packages
$(MAKE) -C kernel
tar cf - \ tar cf - \
Dockerfile etc init mkinitrd.sh \ Dockerfile etc init mkinitrd.sh \
-C kernel usr etc sbin lib -C .. \ -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 build -t moby-bios:build -f Dockerfile.bios .
docker run --net=none --rm moby-bios:build cat /tmp/mobylinux-bios.iso > $@ 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 common: initrd.img
$(MAKE) -C kernel $(MAKE) -C kernel
$(MAKE) -C packages $(MAKE) -j -C packages
ami: common ami: common
docker-compose build ami docker-compose build ami
@ -89,11 +62,10 @@ azure: common
docker-compose run --rm -T azure uploadvhd docker-compose run --rm -T azure uploadvhd
clean: 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 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-efi:build | xargs docker rmi -f || true
docker images -q moby-bios: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_ami:latest | xargs docker rmi -f || true
docker images -q alpine_azure:latest | xargs docker rmi -f || true docker images -q alpine_azure:latest | xargs docker rmi -f || true
$(MAKE) -C packages clean $(MAKE) -C packages clean