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

Move ebpf to its own directory

Browse Source 
Unlike the other images in `base` this needs parts from the
Moby build so move it for now.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack
2017-01-24 18:50:38 +00:00
parent b53e83d695
commit f27c3ff5ed
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
alpine/Makefile
View File

@@ -28,7 +28,7 @@ GCE_IMAGE=mobylinux/mkimage-gce@sha256:f9abf2eae20984b7dd3c1afb700b2c9c41e39e6e7
moby.img: Dockerfile mkinitrd.sh init $(ETCFILES) moby.img: Dockerfile mkinitrd.sh init $(ETCFILES)
$(MAKE) -C kernel $(MAKE) -C kernel
$(MAKE) -j -C packages $(MAKE) -j -C packages
$(MAKE) -C base/ebpf $(MAKE) -C ebpf
printf $(TAG)$(DIRTY) > etc/moby-commit printf $(TAG)$(DIRTY) > etc/moby-commit
BUILD=$$( tar cf - \ BUILD=$$( tar cf - \
Dockerfile etc usr init mkinitrd.sh \ Dockerfile etc usr init mkinitrd.sh \
@@ -216,6 +216,6 @@ clean:
$(MAKE) -C containers clean $(MAKE) -C containers clean
$(MAKE) -C test clean $(MAKE) -C test clean
$(MAKE) -C kernel clean $(MAKE) -C kernel clean
$(MAKE) -C base/ebpf clean $(MAKE) -C ebpf clean
.DELETE_ON_ERROR: .DELETE_ON_ERROR:

0
alpine/base/ebpf/Dockerfile → alpine/ebpf/Dockerfile
View File

2
alpine/base/ebpf/Makefile → alpine/ebpf/Makefile
View File

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