mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-19 01:06:27 +00:00
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:
parent
64ba23d33f
commit
1dfa213db0
9
.gitignore
vendored
9
.gitignore
vendored
@ -1,4 +1,11 @@
|
||||
test.log
|
||||
*.swp
|
||||
/hyperkit.bin
|
||||
/disk.img
|
||||
*.img
|
||||
*.tag
|
||||
*.iso
|
||||
*.vhd
|
||||
*.tar
|
||||
*.tar.gz
|
||||
*.vhdx
|
||||
*.efi
|
||||
|
8
alpine/.gitignore
vendored
8
alpine/.gitignore
vendored
@ -1,9 +1 @@
|
||||
*.img
|
||||
*.tag
|
||||
*.iso
|
||||
*.vhd
|
||||
*.tar
|
||||
*.tar.gz
|
||||
/mobylinux-boot.vhdx
|
||||
/mobylinux.efi
|
||||
etc/moby-commit
|
||||
|
@ -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:
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user