Move ebpf to top level

Do not build by default, as we are not using yet.

Clean up the gitignores at the same time as they were affected.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2017-02-01 10:58:16 +00:00
parent 64ba23d33f
commit 1dfa213db0
5 changed files with 10 additions and 16 deletions

9
.gitignore vendored
View File

@ -1,4 +1,11 @@
test.log
*.swp
/hyperkit.bin
/disk.img
*.img
*.tag
*.iso
*.vhd
*.tar
*.tar.gz
*.vhdx
*.efi

8
alpine/.gitignore vendored
View File

@ -1,9 +1 @@
*.img
*.tag
*.iso
*.vhd
*.tar
*.tar.gz
/mobylinux-boot.vhdx
/mobylinux.efi
etc/moby-commit

View File

@ -1,4 +1,4 @@
all: initrd.img initrd-test.img mobylinux-efi.iso mobylinux-bios.iso ebpf
all: initrd.img initrd-test.img mobylinux-efi.iso mobylinux-bios.iso
ETCFILES=$(shell find etc)
@ -77,10 +77,6 @@ initrd.img: moby.img kernel/x86_64/kernel.img container.img
initrd-test.img: initrd.img test.img
cat $^ > $@
.PHONY: epbf
ebpf: kernel/x86_64/kernel.img
$(MAKE) -C ebpf
# outputs tarball of mobylinux-efi.iso mobylinux.efi
mobylinux-efi.iso: initrd.img kernel/x86_64/vmlinuz64
tar cf - $^ | docker run --rm --net=none --log-driver=none -i $(EFI_IMAGE) | tar xf -
@ -217,6 +213,5 @@ clean:
$(MAKE) -C containers clean
$(MAKE) -C test clean
$(MAKE) -C kernel clean
$(MAKE) -C ebpf clean
.DELETE_ON_ERROR:

View File

@ -1,4 +1,4 @@
KERNEL_FILES=-C ../kernel/x86_64 kernel-headers.tar kernel-dev.tar kernel-modules.tar
KERNEL_FILES=-C ../alpine/kernel/x86_64 kernel-headers.tar kernel-dev.tar kernel-modules.tar
default: ebpf.tag